From 702877465c9ac2ce5d456fae3c22534d93a864bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Krop=C3=A1=C4=8Dek?= Date: Tue, 19 Dec 2023 14:39:59 +0100 Subject: [PATCH 1/3] Started to add subjects --- facturio/urls.py | 1 + poetry.lock | 186 +++++++++++++++++++++++++- pyproject.toml | 1 + subjects/admin.py | 4 +- subjects/migrations/0001_initial.py | 26 ++++ subjects/models.py | 10 +- subjects/templates/subjects/ares.html | 23 ++++ subjects/urls.py | 7 + subjects/views.py | 37 ++++- 9 files changed, 291 insertions(+), 4 deletions(-) create mode 100644 subjects/migrations/0001_initial.py create mode 100644 subjects/templates/subjects/ares.html create mode 100644 subjects/urls.py diff --git a/facturio/urls.py b/facturio/urls.py index 179664c..9a5aecd 100644 --- a/facturio/urls.py +++ b/facturio/urls.py @@ -27,5 +27,6 @@ def landing_page(req: HttpRequest) -> HttpResponse: urlpatterns = [ path("", landing_page, name="main-page"), path("account/", include("account.urls")), + path("subjects/", include("subjects.urls")), path("admin/", admin.site.urls), ] diff --git a/poetry.lock b/poetry.lock index b0d5c30..1b107d6 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,5 +1,20 @@ # This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. +[[package]] +name = "ares-util" +version = "0.2.2" +description = "A tool for information system allowing a retrieval of information on economic entities registered in the Czech Republic (ARES - Access to Registers of Economic Subjects / Entities)." +optional = false +python-versions = "*" +files = [ + {file = "ares_util-0.2.2-py2.py3-none-any.whl", hash = "sha256:ba65ed20000c73e25bd038d28837c74e5ebd47fc1ac8f5da077c8d5d44f0b2bd"}, + {file = "ares_util-0.2.2.tar.gz", hash = "sha256:c4d264bb51e10d3f0e2c9553f84b3d88f23d798fc9e04823372e3524726c7055"}, +] + +[package.dependencies] +requests = "*" +xmltodict = "*" + [[package]] name = "asgiref" version = "3.7.2" @@ -14,6 +29,116 @@ files = [ [package.extras] tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"] +[[package]] +name = "certifi" +version = "2023.11.17" +description = "Python package for providing Mozilla's CA Bundle." +optional = false +python-versions = ">=3.6" +files = [ + {file = "certifi-2023.11.17-py3-none-any.whl", hash = "sha256:e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474"}, + {file = "certifi-2023.11.17.tar.gz", hash = "sha256:9b469f3a900bf28dc19b8cfbf8019bf47f7fdd1a65a1d4ffb98fc14166beb4d1"}, +] + +[[package]] +name = "charset-normalizer" +version = "3.3.2" +description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." +optional = false +python-versions = ">=3.7.0" +files = [ + {file = "charset-normalizer-3.3.2.tar.gz", hash = "sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-win32.whl", hash = "sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73"}, + {file = "charset_normalizer-3.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-win32.whl", hash = "sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab"}, + {file = "charset_normalizer-3.3.2-cp311-cp311-win_amd64.whl", hash = "sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-win32.whl", hash = "sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7"}, + {file = "charset_normalizer-3.3.2-cp312-cp312-win_amd64.whl", hash = "sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-win32.whl", hash = "sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4"}, + {file = "charset_normalizer-3.3.2-cp37-cp37m-win_amd64.whl", hash = "sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-win32.whl", hash = "sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25"}, + {file = "charset_normalizer-3.3.2-cp38-cp38-win_amd64.whl", hash = "sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-win32.whl", hash = "sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f"}, + {file = "charset_normalizer-3.3.2-cp39-cp39-win_amd64.whl", hash = "sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d"}, + {file = "charset_normalizer-3.3.2-py3-none-any.whl", hash = "sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc"}, +] + [[package]] name = "crispy-bootstrap5" version = "2023.10" @@ -66,6 +191,38 @@ files = [ [package.dependencies] django = ">=4.2" +[[package]] +name = "idna" +version = "3.6" +description = "Internationalized Domain Names in Applications (IDNA)" +optional = false +python-versions = ">=3.5" +files = [ + {file = "idna-3.6-py3-none-any.whl", hash = "sha256:c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f"}, + {file = "idna-3.6.tar.gz", hash = "sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca"}, +] + +[[package]] +name = "requests" +version = "2.31.0" +description = "Python HTTP for Humans." +optional = false +python-versions = ">=3.7" +files = [ + {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"}, + {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"}, +] + +[package.dependencies] +certifi = ">=2017.4.17" +charset-normalizer = ">=2,<4" +idna = ">=2.5,<4" +urllib3 = ">=1.21.1,<3" + +[package.extras] +socks = ["PySocks (>=1.5.6,!=1.5.7)"] +use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] + [[package]] name = "sqlparse" version = "0.4.4" @@ -93,7 +250,34 @@ files = [ {file = "tzdata-2023.3.tar.gz", hash = "sha256:11ef1e08e54acb0d4f95bdb1be05da659673de4acbd21bf9c69e94cc5e907a3a"}, ] +[[package]] +name = "urllib3" +version = "2.1.0" +description = "HTTP library with thread-safe connection pooling, file post, and more." +optional = false +python-versions = ">=3.8" +files = [ + {file = "urllib3-2.1.0-py3-none-any.whl", hash = "sha256:55901e917a5896a349ff771be919f8bd99aff50b79fe58fec595eb37bbc56bb3"}, + {file = "urllib3-2.1.0.tar.gz", hash = "sha256:df7aa8afb0148fa78488e7899b2c59b5f4ffcfa82e6c54ccb9dd37c1d7b52d54"}, +] + +[package.extras] +brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)"] +socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"] +zstd = ["zstandard (>=0.18.0)"] + +[[package]] +name = "xmltodict" +version = "0.13.0" +description = "Makes working with XML feel like you are working with JSON" +optional = false +python-versions = ">=3.4" +files = [ + {file = "xmltodict-0.13.0-py2.py3-none-any.whl", hash = "sha256:aa89e8fd76320154a40d19a0df04a4695fb9dc5ba977cbb68ab3e4eb225e7852"}, + {file = "xmltodict-0.13.0.tar.gz", hash = "sha256:341595a488e3e01a85a9d8911d8912fd922ede5fecc4dce437eb4b6c8d037e56"}, +] + [metadata] lock-version = "2.0" python-versions = "^3.12" -content-hash = "a3eaa3850f93a5b33da70f1d4831d68ee7593e05e7a0e040de0cc09229be92fd" +content-hash = "597652155f8c0aa71c8f294edb652c38e81be74dec44b05c19d5a4f8c5f9759d" diff --git a/pyproject.toml b/pyproject.toml index 355cee7..e9e18ea 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,6 +11,7 @@ python = "^3.12" django = "^5.0" crispy-bootstrap5 = "^2023.10" django-crispy-forms = "^2.1" +ares-util = "^0.2.2" [build-system] diff --git a/subjects/admin.py b/subjects/admin.py index 8c38f3f..dd45906 100644 --- a/subjects/admin.py +++ b/subjects/admin.py @@ -1,3 +1,5 @@ from django.contrib import admin -# Register your models here. +from . import models + +admin.site.register(models.Subject) diff --git a/subjects/migrations/0001_initial.py b/subjects/migrations/0001_initial.py new file mode 100644 index 0000000..e5f9dd5 --- /dev/null +++ b/subjects/migrations/0001_initial.py @@ -0,0 +1,26 @@ +# Generated by Django 5.0 on 2023-12-19 13:38 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + initial = True + + dependencies = [] + + operations = [ + migrations.CreateModel( + name="Subject", + fields=[ + ( + "id", + models.CharField( + max_length=8, + primary_key=True, + serialize=False, + verbose_name="cin", + ), + ), + ], + ), + ] diff --git a/subjects/models.py b/subjects/models.py index 71a8362..d3a9805 100644 --- a/subjects/models.py +++ b/subjects/models.py @@ -1,3 +1,11 @@ from django.db import models -# Create your models here. +from django.utils.translation import gettext_lazy as _ + + +class Subject(models.Model): + id = models.CharField( + _("cin"), + max_length=8, + primary_key=True + ) diff --git a/subjects/templates/subjects/ares.html b/subjects/templates/subjects/ares.html new file mode 100644 index 0000000..eae6f1a --- /dev/null +++ b/subjects/templates/subjects/ares.html @@ -0,0 +1,23 @@ +{% extends "facturio/base.html" %} + +{% block title %}AresTest{% endblock %} + +{% block content %} +
+

Ares data

+
+ {% if error %} +
+
Ares search failed!
+

{{ error }}

+
+ {% endif %} + {% if ares_data %} +
+
Ares data
+ 
{{ ares_data|pprint }}
+
+ {% endif %} +
+
+{% endblock %} diff --git a/subjects/urls.py b/subjects/urls.py new file mode 100644 index 0000000..b2a4c93 --- /dev/null +++ b/subjects/urls.py @@ -0,0 +1,7 @@ +from django.urls import path + +from . import views + +urlpatterns = [ + path("", views.test, name="ares_test") +] diff --git a/subjects/views.py b/subjects/views.py index 727d556..ee36ee3 100644 --- a/subjects/views.py +++ b/subjects/views.py @@ -1,3 +1,38 @@ -# Create your views here. +from ares_util.ares import call_ares, validate_czech_company_id +from ares_util.exceptions import InvalidCompanyIDError +from django.http import HttpRequest, HttpResponse +from django.shortcuts import render ARES_BASE_URL = "https://wwwinfo.mfcr.cz/cgi-bin/ares/darv_rzp.cgi?ico=27074358&xml=0&ver=1.0.4" + + +def build_address(street: str, zip_code: int | str, city: str, city_part: str) -> str: + return f"{street}, {zip_code}, {city} - {city_part}" + + +def test(req: HttpRequest, ico: str) -> HttpResponse: + try: + validate_czech_company_id(ico) + except InvalidCompanyIDError as ex: + return render(req, "subjects/ares.html", dict(error=ex, ares_data={})) + + ares_data = call_ares(ico) + + ares_address_data = ares_data["address"] + ares_legal_data = ares_data["legal"] + + address_line = build_address( + ares_address_data["street"], + ares_address_data["zip_code"], + ares_address_data["city"], + ares_address_data["city_part"] + ) + + important_data = dict( + copmany_name=ares_legal_data["company_name"], + company_id=ares_legal_data["company_id"], + company_vat_id=ares_legal_data["company_vat_id"], + address_line=address_line, + ) + + return render(req, "subjects/ares.html", dict(error="", ares_data=important_data)) -- 2.45.2 From d2faa872ace5ce449a7bd5e2a8a858c05106470c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Krop=C3=A1=C4=8Dek?= Date: Thu, 21 Dec 2023 00:39:13 +0100 Subject: [PATCH 2/3] Added ares to automatically add subjects and refactored named views --- account/templates/account/me.html | 16 ----- {account => accounts}/__init__.py | 0 {account => accounts}/admin.py | 0 {account => accounts}/apps.py | 2 +- {account => accounts}/forms.py | 4 +- .../migrations/0001_initial.py | 0 ...er_email_alter_user_first_name_and_more.py | 2 +- {account => accounts}/migrations/__init__.py | 0 {account => accounts}/models.py | 0 .../templates/account/login.html | 0 accounts/templates/account/me.html | 14 +++++ .../templates/account/register.html | 0 {account => accounts}/tests.py | 0 {account => accounts}/urls.py | 5 +- {account => accounts}/views.py | 0 facturio/settings.py | 6 +- facturio/urls.py | 2 +- subjects/admin.py | 6 +- subjects/forms.py | 46 +++++++++++++++ subjects/migrations/0001_initial.py | 18 +++++- ...t_city_alter_subject_city_part_and_more.py | 53 +++++++++++++++++ subjects/models.py | 39 +++++++++++- subjects/templates/subjects/ares.html | 23 -------- subjects/templates/subjects/create.html | 9 +++ subjects/templates/subjects/index.html | 33 +++++++++++ subjects/urls.py | 5 +- subjects/views.py | 59 +++++++++++-------- templates/facturio/base.html | 20 +++---- 28 files changed, 274 insertions(+), 88 deletions(-) delete mode 100644 account/templates/account/me.html rename {account => accounts}/__init__.py (100%) rename {account => accounts}/admin.py (100%) rename {account => accounts}/apps.py (85%) rename {account => accounts}/forms.py (88%) rename {account => accounts}/migrations/0001_initial.py (100%) rename {account => accounts}/migrations/0002_alter_user_email_alter_user_first_name_and_more.py (95%) rename {account => accounts}/migrations/__init__.py (100%) rename {account => accounts}/models.py (100%) rename {account => accounts}/templates/account/login.html (100%) create mode 100644 accounts/templates/account/me.html rename {account => accounts}/templates/account/register.html (100%) rename {account => accounts}/tests.py (100%) rename {account => accounts}/urls.py (79%) rename {account => accounts}/views.py (100%) create mode 100644 subjects/forms.py create mode 100644 subjects/migrations/0002_alter_subject_city_alter_subject_city_part_and_more.py delete mode 100644 subjects/templates/subjects/ares.html create mode 100644 subjects/templates/subjects/create.html create mode 100644 subjects/templates/subjects/index.html diff --git a/account/templates/account/me.html b/account/templates/account/me.html deleted file mode 100644 index 5887c40..0000000 --- a/account/templates/account/me.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "facturio/base.html" %} - -{% block title %}About Me{% endblock %} - -{% block content %} -
-

About Me

-
-
Welcome, {{ request.user.first_name }} {{ request.user.last_name }}!
-
    -
  • Username: {{ request.user.username }}
    • -
  • Email: {{ request.user.email }}
    • -
-
-
-{% endblock %} diff --git a/account/__init__.py b/accounts/__init__.py similarity index 100% rename from account/__init__.py rename to accounts/__init__.py diff --git a/account/admin.py b/accounts/admin.py similarity index 100% rename from account/admin.py rename to accounts/admin.py diff --git a/account/apps.py b/accounts/apps.py similarity index 85% rename from account/apps.py rename to accounts/apps.py index 2c684a9..ec4e357 100644 --- a/account/apps.py +++ b/accounts/apps.py @@ -3,4 +3,4 @@ from django.apps import AppConfig class AccountConfig(AppConfig): default_auto_field = "django.db.models.BigAutoField" - name = "account" + name = "accounts" diff --git a/account/forms.py b/accounts/forms.py similarity index 88% rename from account/forms.py rename to accounts/forms.py index e85403f..0e3f646 100644 --- a/account/forms.py +++ b/accounts/forms.py @@ -11,7 +11,7 @@ class LoginForm(AuthenticationForm): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.helper = helper.FormHelper() - self.helper.form_action = "login" + self.helper.form_action = "accounts:login" self.helper.form_method = "post" self.helper.add_input(layout.Submit('submit', 'Login')) @@ -24,6 +24,6 @@ class RegisterForm(UserCreationForm): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.helper = helper.FormHelper() - self.helper.form_action = "register" + self.helper.form_action = "accounts:register" self.helper.form_method = "post" self.helper.add_input(layout.Submit('submit', 'Register')) diff --git a/account/migrations/0001_initial.py b/accounts/migrations/0001_initial.py similarity index 100% rename from account/migrations/0001_initial.py rename to accounts/migrations/0001_initial.py diff --git a/account/migrations/0002_alter_user_email_alter_user_first_name_and_more.py b/accounts/migrations/0002_alter_user_email_alter_user_first_name_and_more.py similarity index 95% rename from account/migrations/0002_alter_user_email_alter_user_first_name_and_more.py rename to accounts/migrations/0002_alter_user_email_alter_user_first_name_and_more.py index b8f4201..be9e06f 100644 --- a/account/migrations/0002_alter_user_email_alter_user_first_name_and_more.py +++ b/accounts/migrations/0002_alter_user_email_alter_user_first_name_and_more.py @@ -5,7 +5,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ("account", "0001_initial"), + ("accounts", "0001_initial"), ] operations = [ diff --git a/account/migrations/__init__.py b/accounts/migrations/__init__.py similarity index 100% rename from account/migrations/__init__.py rename to accounts/migrations/__init__.py diff --git a/account/models.py b/accounts/models.py similarity index 100% rename from account/models.py rename to accounts/models.py diff --git a/account/templates/account/login.html b/accounts/templates/account/login.html similarity index 100% rename from account/templates/account/login.html rename to accounts/templates/account/login.html diff --git a/accounts/templates/account/me.html b/accounts/templates/account/me.html new file mode 100644 index 0000000..37caf86 --- /dev/null +++ b/accounts/templates/account/me.html @@ -0,0 +1,14 @@ +{% extends "facturio/base.html" %} + +{% block title %}About Me{% endblock %} + +{% block content %} +

About Me

+
+
Welcome, {{ request.user.first_name }} {{ request.user.last_name }}!
+
    +
  • Username: {{ request.user.username }}
    • +
  • Email: {{ request.user.email }}
    • +
+
+{% endblock %} diff --git a/account/templates/account/register.html b/accounts/templates/account/register.html similarity index 100% rename from account/templates/account/register.html rename to accounts/templates/account/register.html diff --git a/account/tests.py b/accounts/tests.py similarity index 100% rename from account/tests.py rename to accounts/tests.py diff --git a/account/urls.py b/accounts/urls.py similarity index 79% rename from account/urls.py rename to accounts/urls.py index 2184e52..8e7a9ac 100644 --- a/account/urls.py +++ b/accounts/urls.py @@ -1,8 +1,9 @@ -from django.http import HttpResponse -from django.urls import path, re_path +from django.urls import path from . import views +app_name = "accounts" + urlpatterns = [ path("", views.me, name="me"), path("me/", views.me, name="me_exp"), diff --git a/account/views.py b/accounts/views.py similarity index 100% rename from account/views.py rename to accounts/views.py diff --git a/facturio/settings.py b/facturio/settings.py index fbc69af..b92181f 100644 --- a/facturio/settings.py +++ b/facturio/settings.py @@ -37,7 +37,7 @@ INSTALLED_APPS = [ "django.contrib.staticfiles", "crispy_forms", "crispy_bootstrap5", - "account.apps.AccountConfig", + "accounts.apps.AccountConfig", "subjects.apps.SubjectsConfig" ] @@ -121,12 +121,12 @@ STATIC_URL = "static/" DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" # Auth configuration -LOGIN_BASE_URL = "/account" +LOGIN_BASE_URL = "/accounts" LOGIN_URL = f"{LOGIN_BASE_URL}/login" LOGOUT_REDIRECT_URL = f"/" LOGIN_REDIRECT_URL = f"{LOGIN_BASE_URL}/me" -AUTH_USER_MODEL = "account.User" +AUTH_USER_MODEL = "accounts.User" # Crispy config CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5" diff --git a/facturio/urls.py b/facturio/urls.py index 9a5aecd..a932a8d 100644 --- a/facturio/urls.py +++ b/facturio/urls.py @@ -26,7 +26,7 @@ def landing_page(req: HttpRequest) -> HttpResponse: urlpatterns = [ path("", landing_page, name="main-page"), - path("account/", include("account.urls")), + path("accounts/", include("accounts.urls")), path("subjects/", include("subjects.urls")), path("admin/", admin.site.urls), ] diff --git a/subjects/admin.py b/subjects/admin.py index dd45906..17549f6 100644 --- a/subjects/admin.py +++ b/subjects/admin.py @@ -2,4 +2,8 @@ from django.contrib import admin from . import models -admin.site.register(models.Subject) + +@admin.register(models.Subject) +class SubjectAdmin(admin.ModelAdmin): + list_display = ["id", "name", "city", "city_part", "zip_code"] + diff --git a/subjects/forms.py b/subjects/forms.py new file mode 100644 index 0000000..13f4b8e --- /dev/null +++ b/subjects/forms.py @@ -0,0 +1,46 @@ +from ares_util.ares import validate_czech_company_id +from ares_util.exceptions import InvalidCompanyIDError +from crispy_forms import helper, layout +from django import forms +from django.core.exceptions import ValidationError +from django.forms import fields +from django.utils.translation import gettext_lazy as _ + +from . import models + + +class CreateSubjectForm(forms.Form): + error_messages = { + "invalid_cin": _("Your provided CIN is not correct."), + "already_existing": _("Subject with provided CIN already exists.") + } + cin = fields.CharField( + label=_("CIN"), + max_length=8, + help_text=_("Enter the subject CIN, rest will be generated automatically") + ) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.helper = helper.FormHelper() + self.helper.form_action = "subjects:create" + self.helper.form_method = "post" + self.helper.add_input(layout.Submit('submit', 'Add')) + + def clean_cin(self): + cin = self.cleaned_data.get("cin") + try: + validate_czech_company_id(cin) + except InvalidCompanyIDError as ex: + raise ValidationError( + self.error_messages["invalid_cin"] + ) + + try: + models.Subject.objects.get(id=cin) + except models.Subject.DoesNotExist: + return cin + + raise ValidationError( + self.error_messages["already_existing"] + ) diff --git a/subjects/migrations/0001_initial.py b/subjects/migrations/0001_initial.py index e5f9dd5..28c57bb 100644 --- a/subjects/migrations/0001_initial.py +++ b/subjects/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 5.0 on 2023-12-19 13:38 +# Generated by Django 5.0 on 2023-12-20 22:36 from django.db import migrations, models @@ -21,6 +21,22 @@ class Migration(migrations.Migration): verbose_name="cin", ), ), + ("name", models.CharField(max_length=128, verbose_name="name")), + ( + "vat_id", + models.CharField( + blank=True, max_length=12, null=True, verbose_name="vat_id" + ), + ), + ("street", models.CharField(max_length=64, verbose_name="street")), + ("zip_code", models.CharField(max_length=6, verbose_name="zip_code")), + ("city", models.CharField(max_length=64, verbose_name="city")), + ( + "city_part", + models.CharField( + blank=True, max_length=64, null=True, verbose_name="city_part" + ), + ), ], ), ] diff --git a/subjects/migrations/0002_alter_subject_city_alter_subject_city_part_and_more.py b/subjects/migrations/0002_alter_subject_city_alter_subject_city_part_and_more.py new file mode 100644 index 0000000..fdb6fb1 --- /dev/null +++ b/subjects/migrations/0002_alter_subject_city_alter_subject_city_part_and_more.py @@ -0,0 +1,53 @@ +# Generated by Django 5.0 on 2023-12-20 22:47 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("subjects", "0001_initial"), + ] + + operations = [ + migrations.AlterField( + model_name="subject", + name="city", + field=models.CharField(max_length=64, verbose_name="City"), + ), + migrations.AlterField( + model_name="subject", + name="city_part", + field=models.CharField( + blank=True, max_length=64, null=True, verbose_name="City part" + ), + ), + migrations.AlterField( + model_name="subject", + name="id", + field=models.CharField( + max_length=8, primary_key=True, serialize=False, verbose_name="CIN" + ), + ), + migrations.AlterField( + model_name="subject", + name="name", + field=models.CharField(max_length=128, verbose_name="Name"), + ), + migrations.AlterField( + model_name="subject", + name="street", + field=models.CharField(max_length=64, verbose_name="Street"), + ), + migrations.AlterField( + model_name="subject", + name="vat_id", + field=models.CharField( + blank=True, max_length=12, null=True, verbose_name="VAT ID" + ), + ), + migrations.AlterField( + model_name="subject", + name="zip_code", + field=models.CharField(max_length=6, verbose_name="Zip Code"), + ), + ] diff --git a/subjects/models.py b/subjects/models.py index d3a9805..78ad294 100644 --- a/subjects/models.py +++ b/subjects/models.py @@ -5,7 +5,44 @@ from django.utils.translation import gettext_lazy as _ class Subject(models.Model): id = models.CharField( - _("cin"), + _("CIN"), max_length=8, primary_key=True ) + + name = models.CharField( + _("Name"), + max_length=128 + ) + + vat_id = models.CharField( + _("VAT ID"), + max_length=12, + null=True, + blank=True + ) + + street = models.CharField( + _("Street"), + max_length=64, + ) + + zip_code = models.CharField( + _("Zip Code"), + max_length=6, + ) + + city = models.CharField( + _("City"), + max_length=64, + ) + + city_part = models.CharField( + _("City part"), + max_length=64, + null=True, + blank=True + ) + + def __str__(self): + return self.name diff --git a/subjects/templates/subjects/ares.html b/subjects/templates/subjects/ares.html deleted file mode 100644 index eae6f1a..0000000 --- a/subjects/templates/subjects/ares.html +++ /dev/null @@ -1,23 +0,0 @@ -{% extends "facturio/base.html" %} - -{% block title %}AresTest{% endblock %} - -{% block content %} -
-

Ares data

-
- {% if error %} -
-
Ares search failed!
-

{{ error }}

-
- {% endif %} - {% if ares_data %} -
-
Ares data
- 
{{ ares_data|pprint }}
-
- {% endif %} -
-
-{% endblock %} diff --git a/subjects/templates/subjects/create.html b/subjects/templates/subjects/create.html new file mode 100644 index 0000000..cd4f345 --- /dev/null +++ b/subjects/templates/subjects/create.html @@ -0,0 +1,9 @@ +{% extends "facturio/base.html" %} + +{% load crispy_forms_tags %} + +{% block title %}Create Subjects{% endblock %} + +{% block content %} + {% crispy form form.helper %} +{% endblock %} \ No newline at end of file diff --git a/subjects/templates/subjects/index.html b/subjects/templates/subjects/index.html new file mode 100644 index 0000000..62d8d90 --- /dev/null +++ b/subjects/templates/subjects/index.html @@ -0,0 +1,33 @@ +{% extends "facturio/base.html" %} + +{% block title %}Subjects{% endblock %} + +{% block content %} + Add new + + + + + + + + + + + + + + {% for subject in subjects %} + + + + + + + + + + {% endfor %} + +
CINNameVAT IDStreetZip CodeCityCity part
{{ subject.id }}{{ subject.name }}{{ subject.vat_id }}{{ subject.street }}{{ subject.zip_code }}{{ subject.city }}{{ subject.city_part }}
+{% endblock %} diff --git a/subjects/urls.py b/subjects/urls.py index b2a4c93..799d82a 100644 --- a/subjects/urls.py +++ b/subjects/urls.py @@ -2,6 +2,9 @@ from django.urls import path from . import views +app_name = "subjects" + urlpatterns = [ - path("", views.test, name="ares_test") + path("", views.main_page, name="list"), + path("new/", views.create_subject, name="create") ] diff --git a/subjects/views.py b/subjects/views.py index ee36ee3..0c8cab5 100644 --- a/subjects/views.py +++ b/subjects/views.py @@ -1,38 +1,47 @@ -from ares_util.ares import call_ares, validate_czech_company_id -from ares_util.exceptions import InvalidCompanyIDError +from ares_util.ares import call_ares from django.http import HttpRequest, HttpResponse -from django.shortcuts import render +from django.shortcuts import render, redirect +from django.urls import reverse -ARES_BASE_URL = "https://wwwinfo.mfcr.cz/cgi-bin/ares/darv_rzp.cgi?ico=27074358&xml=0&ver=1.0.4" +from . import models, forms def build_address(street: str, zip_code: int | str, city: str, city_part: str) -> str: return f"{street}, {zip_code}, {city} - {city_part}" -def test(req: HttpRequest, ico: str) -> HttpResponse: - try: - validate_czech_company_id(ico) - except InvalidCompanyIDError as ex: - return render(req, "subjects/ares.html", dict(error=ex, ares_data={})) +def main_page(req: HttpRequest) -> HttpResponse: + subjects = models.Subject.objects.all() + return render(req, "subjects/index.html", dict(subjects=subjects)) - ares_data = call_ares(ico) - ares_address_data = ares_data["address"] - ares_legal_data = ares_data["legal"] +def create_subject(req: HttpRequest) -> HttpResponse: + if req.method == "POST": + form = forms.CreateSubjectForm(data=req.POST) - address_line = build_address( - ares_address_data["street"], - ares_address_data["zip_code"], - ares_address_data["city"], - ares_address_data["city_part"] - ) + if not form.is_valid(): + return render(req, "subjects/create.html", dict(form=form)) - important_data = dict( - copmany_name=ares_legal_data["company_name"], - company_id=ares_legal_data["company_id"], - company_vat_id=ares_legal_data["company_vat_id"], - address_line=address_line, - ) + ares_data = call_ares(form.cleaned_data.get("cin")) - return render(req, "subjects/ares.html", dict(error="", ares_data=important_data)) + ares_address_data = ares_data["address"] + ares_legal_data = ares_data["legal"] + + models.Subject.objects.create( + id=ares_legal_data["company_id"], + vat_id=ares_legal_data["company_vat_id"], + name=ares_legal_data["company_name"], + street=ares_address_data["street"], + zip_code=ares_address_data["zip_code"], + city=ares_address_data["city"], + city_part=ares_address_data["city_part"], + ) + + return redirect(reverse("subjects:list")) + + elif req.method == "GET": + form = forms.CreateSubjectForm() + + return render(req, "subjects/create.html", dict(form=form)) + + return HttpResponse(status=405) diff --git a/templates/facturio/base.html b/templates/facturio/base.html index e1d98ec..9296e0b 100644 --- a/templates/facturio/base.html +++ b/templates/facturio/base.html @@ -2,20 +2,20 @@ + Facturio - {% block title %}App{% endblock %} -