Merge pull request #15 from aparcar/get_contracts

add get_contracts function and overview for cli

Author: olf42

.gitignore

@@ -1,2 +1,10 @@
 *.egg-info/*
 __pycache__
+assets/
+bin/
+contracts/
+invoices/
+lib*
+pyvenv.cfg
+settings.yaml
+share/

rechnung/cli.py

@@ -4,7 +4,7 @@
 
 from .settings import get_settings_from_cwd, copy_assets, create_required_settings_file
 from .invoice import create_invoices, render_invoices, send_invoices
-from .contract import create_contracts, render_contracts, send_contract
+from .contract import create_contracts, render_contracts, send_contract, get_contracts
 
 cwd = os.getcwd()
 
@@ -32,55 +32,76 @@ def init():
 
 
 @cli1.command()
-@click.argument("start_date")
-@click.argument("end_date")
-@click.argument("n_months", type=int)
-@click.argument("year")
-@click.argument("suffix")
-def create(start_date, end_date, n_months, year, suffix):
+@click.argument("year", type=int)
+@click.argument("month", type=int)
+def create(year, month):
     """
     Mass create invoices.
     """
     print("Creating invoices...")
-    create_invoices(cwd, start_date, end_date, n_months, year, suffix)
+    settings = get_settings_from_cwd(cwd)
+    create_invoices(settings, year, month)
 
 
 @cli1.command()
-def contracts():
+def print_contracts():
     """
-    Mass create contracts.
+    Print an overview of all contracs
     """
-    print("Not yet implemented")
+    settings = get_settings_from_cwd(cwd)
+    for cid, data in get_contracts(settings).items():
+        slug = data.get("email", "unknown")
+        total_monthly = sum(map(lambda i: i["price"], data["items"]))
+        print(f"{cid}: {slug} {data['start']} {total_monthly}€")
+
+
+@cli1.command()
+def print_stats():
+    """
+    Print stats about the contracts
+    """
+    settings = get_settings_from_cwd(cwd)
+    contracts = get_contracts(settings).values()
+    print(f"{len(contracts)} contracts in total")
+
+    total_monthly = sum(
+        map(lambda x: x[0]["price"], list(map(lambda i: i["items"], contracts)))
+    )
+    print(f"{total_monthly:.2f}€ per month")
 
 
 @cli1.command()
 def render():
     """
-    Render all unrendered invoices.
+    Render all unrendered invoices and contracs
     """
     print("Rendering invoices and contracts...")
-    render_invoices(cwd)
-    render_contracts(cwd)
+    settings = get_settings_from_cwd(cwd)
+    render_invoices(settings)
+    render_contracts(settings)
 
 
 @cli1.command()
-@click.argument("year_suffix")
-def send(year_suffix):
+@click.argument("year", type=int)
+@click.argument("month", type=int)
+def send(year, month):
     """
     Send invoices by email.
     """
-    print("Sending invoices *.{}".format(year_suffix))
-    send_invoices(cwd, year_suffix)
+    print(f"Sending invoices for {year}.{month:02}")
+    settings = get_settings_from_cwd(cwd)
+    send_invoices(settings, year, month)
 
 
 @cli1.command()
-@click.argument("cid")
+@click.argument("cid", type=int)
 def send_contract_mail(cid):
     """
     Send contract by email.
     """
-    print("Sending contract for customer {}".format(cid))
-    send_contract(cwd, cid)
+    print(f"Sending contract {cid}")
+    settings = get_settings_from_cwd(cwd)
+    send_contract(settings, cid)
 
 
 cli = click.CommandCollection(sources=[cli1])

rechnung/contract.py

@@ -3,10 +3,9 @@
 import os
 import os.path
 import yaml
+from collections import OrderedDict
 
 from pathlib import Path
-from .invoice import get_positions, get_customers
-from .settings import get_settings_from_cwd
 from .helpers import (
     generate_pdf,
     get_pdf,
@@ -17,21 +16,36 @@
 )
 
 
-def generate_contract(customer, positions):
+def get_contracts(settings, year=None, month=None, inactive=False):
+    contracts = OrderedDict()
+    for filename in settings.contracts_dir.glob("*.yaml"):
+        with open(Path(settings.contracts_dir / filename), "r") as contract_file:
+            contract = yaml.safe_load(contract_file)
 
+        if year and month:
+            if contract["start"] < datetime.date(year, month, 1):
+                contracts[contract["cid"]] = contract
+            else:
+                print(f"Ignoring {contract['cid']} with start {contract['start']}")
+        else:
+            contracts[contract["cid"]] = contract
+
+    return {k: contracts[k] for k in sorted(contracts)}
+
+
+def create_contract(customer, positions):
     contract_data = customer
     contract_data["product"] = positions[0]
-    contract_data["product"]["price"] = round(positions[0]["price"] * 1.19, 2)
-
-    if "email" not in customer.keys():
-        contract_data["email"] = None
-    else:
-        contract_data["email"] = customer["email"]
+    contract_data["product"]["price"] = round(
+        positions[0]["price"] * 1.0 + settings.vat, 2
+    )
+    contract_data["email"] = customer["email"]
 
     return contract_data
 
 
-def render_pdf_contracts(directory, template, settings):
+def render_contracts(settings):
+    template = get_template(settings.contract_template_file)
     logo_path = settings.assets_dir / "logo.png"
 
     for contract_filename in Path(settings.contracts_dir).glob("*.yaml"):
@@ -43,43 +57,44 @@ def render_pdf_contracts(directory, template, settings):
             print("Rendering contract pdf for {}".format(contract_data["cid"]))
             contract_data["logo_path"] = logo_path
 
-            for element in ["price", "initial_cost"]:
-                contract_data["product"][element] = locale.format_string(
-                    "%.2f", contract_data["product"][element]
-                )
+            for item in contract_data["items"]:
+                for element in ["price", "initial_cost"]:
+                    item[element] = locale.format_string("%.2f", item.get(element, 0))
 
             if contract_data["start"]:
                 try:
-                    contract_data["start"] = datetime.datetime.strptime(
-                        contract_data["start"], "%Y-%m-%d"
-                    ).strftime("%-d. %B %Y")
+                    contract_data["start"] = contract_data["start"].strftime(
+                        "%-d. %B %Y"
+                    )
                 except ValueError:
                     pass
 
+            print(contract_data)
             contract_html = template.render(contract=contract_data)
 
             generate_pdf(
-                contract_html, settings.contract_css_file, contract_pdf_filename
+                contract_html, settings.contract_css_asset_file, contract_pdf_filename
             )
 
 
-def save_contract_yaml(contracts_dir, contract_data):
-    outfilename = os.path.join(contracts_dir, "{}.yaml".format(contract_data["cid"]))
+def save_contract_yaml(settings, contract_data):
+    outfilename = settings.contracts_dir / contract_data["cid"] + ".yaml"
     try:
         with open(outfilename, "x") as outfile:
             outfile.write(yaml.dump(contract_data, default_flow_style=False))
     except FileExistsError:
         print("Contract {} already exists.".format(outfilename))
 
 
-def create_yaml_contracts(contracts_dir, customers, positions):
+def create_yaml_contracts(settings, customers, positions):
     for cid in customers.keys():
-        print("Creating contract yaml for {}".format(cid))
-        contract_data = generate_contract(customers[cid], positions[cid])
-        save_contract_yaml(contracts_dir, contract_data)
+        print(f"Creating contract yaml for {cid}")
+        contract_data = create_contract(customers[cid], positions[cid])
+        save_contract_yaml(settings, contract_data)
 
 
-def send_contract_mail(settings, mail_template, cid):
+def send_contract(settings, cid):
+    mail_template = get_template(settings.contract_mail_template_file)
     contract_pdf_path = Path(settings.contracts_dir) / f"{cid}.pdf"
     contract_yaml_filename = Path(settings.contracts_dir) / f"{cid}.yaml"
 
@@ -90,31 +105,41 @@ def send_contract_mail(settings, mail_template, cid):
         contract_data = yaml.safe_load(yaml_file)
 
         if contract_data["email"] is None:
-            print("No email given")
+            print("No email given for contract {cid}")
+            quit()
 
-        contract_pdf_filename = "Dein_Westnetz_Vertrag_{}.pdf".format(cid)
+        contract_pdf_filename = f"{settings.company} {contract_yaml_filename.stem}.pdf"
         contract_mail_text = mail_template.render()
         contract_pdf = get_pdf(contract_pdf_path)
 
-        product_pdf_file = "{}.pdf".format(contract_data["product"]["description"])
-        product_pdf_path = Path(settings.assets_dir) / product_pdf_file
-        product_pdf = get_pdf(product_pdf_path)
-
-        policy_pdf_file = settings.policy_attachment_asset_file
-        policy_pdf_path = Path(settings.assets_dir) / policy_pdf_file
-        policy_pdf = get_pdf(policy_pdf_path)
-
-        pdf_documents = [contract_pdf, product_pdf, policy_pdf]
-        pdf_filenames = [
-            contract_pdf_filename,
-            product_pdf_file,
-            "Widerrufsbelehrung.pdf",
-        ]
-
-        contract_receiver = contract_data["email"]
+        pdf_documents = [contract_pdf]
+        pdf_filenames = [contract_pdf_filename]
+
+        for item in contract_data["items"]:
+            item_pdf_file = f"{item['description']}.pdf"
+            if not item_pdf_file in pdf_filenames:
+                item_pdf_path = Path(settings.assets_dir / item_pdf_file)
+                if item_pdf_path.is_file():
+                    item_pdf = get_pdf(item_pdf_path)
+                    pdf_documents.append(item_pdf)
+                    pdf_filenames.append(item_pdf_file)
+                else:
+                    print(f"Item file {item_pdf_file} not found")
+
+        if settings.policy_attachment_asset_file:
+            policy_pdf_file = settings.policy_attachment_asset_file
+            policy_pdf_path = settings.assets_dir / policy_pdf_file
+            if policy_pdf_path.is_file():
+                policy_pdf = get_pdf(policy_pdf_path)
+                pdf_documents.append(policy_pdf)
+                pdf_filenames.append(policy_pdf_file)
+            else:
+                print(
+                    f"Policy file {settings.policy_attachment_asset_file.name} not found"
+                )
 
         contract_email = generate_email_with_pdf_attachments(
-            contract_receiver,
+            contract_data["email"],
             settings.sender,
             settings.contract_mail_subject,
             contract_mail_text,
@@ -133,20 +158,6 @@ def send_contract_mail(settings, mail_template, cid):
         )
 
 
-def create_contracts(directory):
-    settings = get_settings_from_cwd(directory)
-    customers = get_customers(settings.customers_dir)
+def create_contracts(settings):
     positions = get_positions(settings.positions_dir)
-    create_yaml_contracts(settings.contracts_dir, customers, positions)
-
-
-def render_contracts(directory):
-    settings = get_settings_from_cwd(directory)
-    template = get_template(settings.contract_template_file)
-    render_pdf_contracts(directory, template, settings)
-
-
-def send_contract(directory, cid):
-    settings = get_settings_from_cwd(directory)
-    mail_template = get_template(settings.contract_mail_template_file)
-    send_contract_mail(settings, mail_template, cid)
+    create_yaml_contracts(settings)