From ea84da3a92782b67a2ee7b6dfbb81796a1259f0a Mon Sep 17 00:00:00 2001 From: nataly Date: Fri, 12 Apr 2024 17:00:22 +0300 Subject: [PATCH] New changes. --- .../__pycache__/__init__.cpython-311.pyc | Bin 201 -> 182 bytes .../__pycache__/admin.cpython-311.pyc | Bin 733 -> 714 bytes .../__pycache__/apps.cpython-311.pyc | Bin 582 -> 563 bytes .../__pycache__/models.cpython-311.pyc | Bin 3082 -> 3063 bytes .../__pycache__/0001_initial.cpython-311.pyc | Bin 969 -> 950 bytes .../0002_country_addressbook.cpython-311.pyc | Bin 1878 -> 1859 bytes .../__pycache__/0003_contact.cpython-311.pyc | Bin 1455 -> 1436 bytes .../0004_socialmedia.cpython-311.pyc | Bin 1319 -> 1300 bytes ...05_socialmedia_addressbook.cpython-311.pyc | Bin 1030 -> 1011 bytes .../__pycache__/__init__.cpython-311.pyc | Bin 212 -> 193 bytes .../__pycache__/__init__.cpython-311.pyc | Bin 197 -> 178 bytes .../billing/__pycache__/admin.cpython-311.pyc | Bin 985 -> 966 bytes .../billing/__pycache__/apps.cpython-311.pyc | Bin 570 -> 551 bytes .../__pycache__/models.cpython-311.pyc | Bin 7748 -> 8549 bytes .../billing/__pycache__/urls.cpython-311.pyc | Bin 718 -> 1609 bytes .../billing/__pycache__/views.cpython-311.pyc | Bin 1585 -> 5368 bytes .../__pycache__/0001_initial.cpython-311.pyc | Bin 2163 -> 2144 bytes ...vice_cancelled_at_and_more.cpython-311.pyc | Bin 1292 -> 1273 bytes ...003_payment_servicepayment.cpython-311.pyc | Bin 1820 -> 1801 bytes ...rename_payment_paymenttype.cpython-311.pyc | Bin 755 -> 736 bytes ...05_service_recurring_cycle.cpython-311.pyc | Bin 1045 -> 1026 bytes ...ervice_created_at_and_more.cpython-311.pyc | Bin 1168 -> 1149 bytes ...er_service_recurring_cycle.cpython-311.pyc | Bin 1112 -> 1093 bytes .../0008_alter_service_type.cpython-311.pyc | Bin 1097 -> 1078 bytes ...cepayment_service_and_more.cpython-311.pyc | Bin 1804 -> 1785 bytes .../0010_charge_amount.cpython-311.pyc | Bin 925 -> 906 bytes .../__pycache__/0011_invoice.cpython-311.pyc | Bin 1318 -> 1299 bytes ...nt_charge_receipt_and_more.cpython-311.pyc | Bin 1527 -> 1508 bytes ...alter_invoice_date_created.cpython-311.pyc | Bin 865 -> 846 bytes ...014_servicepayment_comment.cpython-311.pyc | Bin 870 -> 851 bytes .../__pycache__/0015_order.cpython-311.pyc | Bin 1573 -> 1554 bytes .../0016_alter_order_status.cpython-311.pyc | Bin 972 -> 953 bytes .../0017_service_order.cpython-311.pyc | Bin 1019 -> 1000 bytes .../0018_alter_order_status.cpython-311.pyc | Bin 980 -> 961 bytes ..._service_customer_and_more.cpython-311.pyc | Bin 4559 -> 4540 bytes .../0020_orderitem.cpython-311.pyc | Bin 1321 -> 1302 bytes ...m_recurring_cycle_and_more.cpython-311.pyc | Bin 1163 -> 1144 bytes ...e_item_created_at_and_more.cpython-311.pyc | Bin 1230 -> 1211 bytes ...em_project_alter_item_type.cpython-311.pyc | Bin 1357 -> 1338 bytes .../0024_remove_item_active.cpython-311.pyc | Bin 749 -> 730 bytes ...item_project_item_customer.cpython-311.pyc | Bin 0 -> 1196 bytes .../__pycache__/__init__.cpython-311.pyc | Bin 208 -> 189 bytes .../templates/add_templates/add-order.html | 85 +++++++ .../templates/add_templates/add-product.html | 72 ++++++ .../templates/add_templates/add-service.html | 72 ++++++ .../billing/templates/invoice-details.html | 30 +++ .../templates/listing_pages/invoices.html | 97 ++++++++ .../templates/listing_pages/items.html | 183 +++++++++++++++ .../templates/listing_pages/orders.html | 100 ++++++++ osinaweb/billing/urls.py | 18 ++ osinaweb/billing/views.py | 111 ++++++++- .../__pycache__/__init__.cpython-311.pyc | Bin 202 -> 183 bytes .../__pycache__/admin.cpython-311.pyc | Bin 257 -> 238 bytes .../__pycache__/apps.cpython-311.pyc | Bin 585 -> 566 bytes .../__pycache__/decorators.cpython-311.pyc | Bin 1100 -> 1081 bytes .../__pycache__/models.cpython-311.pyc | Bin 254 -> 235 bytes .../__pycache__/urls.cpython-311.pyc | Bin 1233 -> 1224 bytes .../__pycache__/views.cpython-311.pyc | Bin 8129 -> 8372 bytes .../__pycache__/__init__.cpython-311.pyc | Bin 213 -> 194 bytes .../listing_pages/customer-invoices.html | 1 - .../templates/listing_pages/products.html | 220 ++++++++---------- osinaweb/customercore/urls.py | 2 +- osinaweb/db.sqlite3 | Bin 999424 -> 999424 bytes osinaweb/input.css | 15 ++ .../__pycache__/__init__.cpython-311.pyc | Bin 199 -> 180 bytes .../__pycache__/admin.cpython-311.pyc | Bin 3509 -> 3490 bytes .../__pycache__/apps.cpython-311.pyc | Bin 576 -> 557 bytes .../custom_context.cpython-311.pyc | Bin 6840 -> 6821 bytes .../__pycache__/decorators.cpython-311.pyc | Bin 1083 -> 1064 bytes .../__pycache__/forms.cpython-311.pyc | Bin 941 -> 922 bytes .../__pycache__/models.cpython-311.pyc | Bin 22930 -> 22911 bytes .../__pycache__/urls.cpython-311.pyc | Bin 5462 -> 5443 bytes .../__pycache__/views.cpython-311.pyc | Bin 26459 -> 26440 bytes .../add/__pycache__/urls.cpython-311.pyc | Bin 2703 -> 2684 bytes .../add/__pycache__/views.cpython-311.pyc | Bin 25478 -> 25459 bytes .../__pycache__/serializers.cpython-311.pyc | Bin 1421 -> 1402 bytes .../api/__pycache__/urls.cpython-311.pyc | Bin 431 -> 412 bytes .../api/__pycache__/views.cpython-311.pyc | Bin 2151 -> 2132 bytes .../delete/__pycache__/urls.cpython-311.pyc | Bin 1613 -> 1594 bytes .../delete/__pycache__/views.cpython-311.pyc | Bin 5870 -> 5851 bytes .../edit/__pycache__/urls.cpython-311.pyc | Bin 2645 -> 2626 bytes .../edit/__pycache__/views.cpython-311.pyc | Bin 25409 -> 25390 bytes .../__pycache__/0001_initial.cpython-311.pyc | Bin 3744 -> 3725 bytes ...ions_staffprofile_and_more.cpython-311.pyc | Bin 3889 -> 3870 bytes .../0003_milestone.cpython-311.pyc | Bin 1521 -> 1502 bytes .../__pycache__/0004_epic.cpython-311.pyc | Bin 1463 -> 1444 bytes .../0005_staffprofile_image.cpython-311.pyc | Bin 851 -> 832 bytes .../__pycache__/0006_note.cpython-311.pyc | Bin 1698 -> 1679 bytes ...ct_id_alter_project_status.cpython-311.pyc | Bin 1150 -> 1131 bytes ...8_alter_project_project_id.cpython-311.pyc | Bin 909 -> 890 bytes ...9_alter_project_project_id.cpython-311.pyc | Bin 893 -> 874 bytes .../0010_remove_note_date.cpython-311.pyc | Bin 739 -> 720 bytes ...r_alter_note_text_and_more.cpython-311.pyc | Bin 1839 -> 1820 bytes .../0012_projectrequirement.cpython-311.pyc | Bin 1323 -> 1304 bytes .../0013_projectfile.cpython-311.pyc | Bin 1433 -> 1414 bytes ...014_alter_projectfile_file.cpython-311.pyc | Bin 862 -> 843 bytes .../0015_projectcredentials.cpython-311.pyc | Bin 1442 -> 1423 bytes ...dentials_projectcredential.cpython-311.pyc | Bin 789 -> 770 bytes ...e_alter_project_start_date.cpython-311.pyc | Bin 1040 -> 1021 bytes .../0018_epic_status.cpython-311.pyc | Bin 938 -> 919 bytes ...date_alter_epic_start_date.cpython-311.pyc | Bin 998 -> 979 bytes .../__pycache__/0020_task.cpython-311.pyc | Bin 1922 -> 1903 bytes ...rprofile_business_and_more.cpython-311.pyc | Bin 2818 -> 2799 bytes ...ustomerprofile_customer_id.cpython-311.pyc | Bin 919 -> 900 bytes .../0023_task_assigned_to.cpython-311.pyc | Bin 1035 -> 1016 bytes .../0024_task_task_id.cpython-311.pyc | Bin 865 -> 846 bytes .../__pycache__/0025_status.cpython-311.pyc | Bin 1589 -> 1570 bytes ...e_status_user_status_staff.cpython-311.pyc | Bin 1167 -> 1148 bytes .../0027_alter_status_staff.cpython-311.pyc | Bin 1082 -> 1063 bytes ...8_remove_projecttype_color.cpython-311.pyc | Bin 749 -> 730 bytes .../0029_alter_reference_date.cpython-311.pyc | Bin 863 -> 844 bytes .../__pycache__/0030_tag.cpython-311.pyc | Bin 990 -> 971 bytes ...1_alter_staffprofile_image.cpython-311.pyc | Bin 869 -> 850 bytes .../__pycache__/0032_point.cpython-311.pyc | Bin 1474 -> 1455 bytes ...nt_date_workingon_and_more.cpython-311.pyc | Bin 1297 -> 1278 bytes ...nt_date_completed_and_more.cpython-311.pyc | Bin 1353 -> 1334 bytes .../0035_business_business_id.cpython-311.pyc | Bin 901 -> 882 bytes ...lter_staffprofile_position.cpython-311.pyc | Bin 1233 -> 1214 bytes ...move_staffprofile_position.cpython-311.pyc | Bin 781 -> 762 bytes ...taffprofile_staff_position.cpython-311.pyc | Bin 1059 -> 1040 bytes ...taffprofile_staff_position.cpython-311.pyc | Bin 1090 -> 1071 bytes ...0040_staffprofile_staff_id.cpython-311.pyc | Bin 901 -> 882 bytes .../0041_dailyreport.cpython-311.pyc | Bin 1499 -> 1480 bytes ...omerprofile_email_and_more.cpython-311.pyc | Bin 1261 -> 1242 bytes .../0043_businesstype.cpython-311.pyc | Bin 1026 -> 1007 bytes ...ove_business_business_type.cpython-311.pyc | Bin 753 -> 734 bytes .../0045_business_type.cpython-311.pyc | Bin 1055 -> 1036 bytes .../0046_task_requirement.cpython-311.pyc | Bin 1051 -> 1032 bytes .../0047_task_status_date.cpython-311.pyc | Bin 963 -> 944 bytes ...r_customerprofile_business.cpython-311.pyc | Bin 1110 -> 1091 bytes ...r_customerprofile_business.cpython-311.pyc | Bin 1078 -> 1059 bytes ...by_projectrequirement_date.cpython-311.pyc | Bin 1391 -> 1372 bytes ...051_alter_task_requirement.cpython-311.pyc | Bin 1075 -> 1056 bytes .../0052_note_project.cpython-311.pyc | Bin 1028 -> 1009 bytes .../0053_pointactivity.cpython-311.pyc | Bin 1310 -> 1291 bytes ...nt_date_completed_and_more.cpython-311.pyc | Bin 1002 -> 983 bytes .../0055_alter_point_status.cpython-311.pyc | Bin 1011 -> 992 bytes ...ter_pointactivity_end_time.cpython-311.pyc | Bin 878 -> 859 bytes ...otal_time_minutes_and_more.cpython-311.pyc | Bin 1181 -> 1162 bytes ..._total_time_hours_and_more.cpython-311.pyc | Bin 977 -> 958 bytes ...059_alter_task_requirement.cpython-311.pyc | Bin 1086 -> 1067 bytes ...0_pointactivity_total_time.cpython-311.pyc | Bin 878 -> 859 bytes ...date_alter_task_start_date.cpython-311.pyc | Bin 1001 -> 982 bytes .../0062_connection.cpython-311.pyc | Bin 1575 -> 1556 bytes ...0063_alter_connection_date.cpython-311.pyc | Bin 845 -> 826 bytes .../__pycache__/0064_reaction.cpython-311.pyc | Bin 1557 -> 1538 bytes ...ter_customerprofile_status.cpython-311.pyc | Bin 999 -> 980 bytes .../__pycache__/__init__.cpython-311.pyc | Bin 210 -> 191 bytes .../osinacore/templates/add-edit-main.html | 74 +++++- .../osinacore/templates/customer_main.html | 2 +- osinaweb/osinacore/templates/main.html | 97 ++++++-- .../__pycache__/__init__.cpython-311.pyc | Bin 198 -> 179 bytes .../__pycache__/settings.cpython-311.pyc | Bin 3358 -> 3339 bytes .../osinaweb/__pycache__/urls.cpython-311.pyc | Bin 1595 -> 1576 bytes .../osinaweb/__pycache__/wsgi.cpython-311.pyc | Bin 722 -> 703 bytes osinaweb/static/dist/output.css | 88 ++++++- .../static/images/ositcom_logos/full-logo.jpg | Bin 0 -> 68933 bytes osinaweb/static/js/billing/add-order.js | 42 ++++ osinaweb/static/js/billing/items.js | 30 +++ .../static/js/customer_dashboard/products.js | 19 ++ .../static/js/get-updated-user-activity.js | 22 +- osinaweb/tailwind.config.js | 1 + 162 files changed, 1213 insertions(+), 168 deletions(-) create mode 100644 osinaweb/billing/migrations/__pycache__/0025_remove_item_project_item_customer.cpython-311.pyc create mode 100644 osinaweb/billing/templates/add_templates/add-order.html create mode 100644 osinaweb/billing/templates/add_templates/add-product.html create mode 100644 osinaweb/billing/templates/add_templates/add-service.html create mode 100644 osinaweb/billing/templates/invoice-details.html create mode 100644 osinaweb/billing/templates/listing_pages/invoices.html create mode 100644 osinaweb/billing/templates/listing_pages/items.html create mode 100644 osinaweb/billing/templates/listing_pages/orders.html create mode 100644 osinaweb/static/images/ositcom_logos/full-logo.jpg create mode 100644 osinaweb/static/js/billing/add-order.js create mode 100644 osinaweb/static/js/billing/items.js create mode 100644 osinaweb/static/js/customer_dashboard/products.js diff --git a/osinaweb/addressbook/__pycache__/__init__.cpython-311.pyc b/osinaweb/addressbook/__pycache__/__init__.cpython-311.pyc index 8498d178f2b31cb5d835d106ee79a99ef0112b5a..5341eae0705b69159a0cb87efc256016524c30a0 100644 GIT binary patch delta 86 zcmX@fxQ&r}IWI340}!Yml$gkEYVYY{6%(Fcl&ug@l%JKFTv8m9U!0kj7@v|Alb2c! hW~XE&=B4LD#LH8YViHqQic*Vo9v delta 105 zcmdnSc#@HOIWI340}wnd6`#m$8Wf`+TAW%`te;<;S(2QetM8JZT$-DjS5mC+mspaR tQwfsDOVmxtO3X{o*Uw8W2lJs^FuOc8Nk1_qr6{$yI4M6rTYqA`IRH@HCEEZ1 diff --git a/osinaweb/addressbook/__pycache__/admin.cpython-311.pyc b/osinaweb/addressbook/__pycache__/admin.cpython-311.pyc index 9a48f802369d7a4249ccdfec8c137dbe42660bf8..2c0c36524769448e669753b08a40fc2e225c3d1b 100644 GIT binary patch delta 90 zcmcc1dWw~IIWI340}!Ymlt}x!k@oMv>NwL0P xVo737B}gJKQ8y(kF)uw|KQFZ$%!hKp?DEtk{lt`%qSWHzr2PDB{mDE``v6RuC?Ws= diff --git a/osinaweb/addressbook/__pycache__/apps.cpython-311.pyc b/osinaweb/addressbook/__pycache__/apps.cpython-311.pyc index 7caee707d1e4c02a04da2d868c492fd24da0813a..4f9f630016f7cf9d1f3931e36bfaf275ca8e7049 100644 GIT binary patch delta 90 zcmX@cvYCZzO|Os-%&2LL2wAW#4R delta 109 zcmdnYa*Ty{IWI340}wnd6;GSBkyny2C_+E9IJKx)KfgG$Bso7<-z7h}G&eP`q*&iC xu_Q645+sqAsGE|Nn3tZfpO;z==0mw)c6n-&equ^WQEG8a_L{pADzSjr%F delta 111 zcmew^-X+1eoR^o20SKO!il^OT-N?6=F(^tuv^ce>SU&srxGNQm#CYPm6(^Fub-D%4(3C-V0L+Gl73=JN>OTYaZ-MMw*KZ{jDI-+bag3N diff --git a/osinaweb/addressbook/migrations/__pycache__/0001_initial.cpython-311.pyc b/osinaweb/addressbook/migrations/__pycache__/0001_initial.cpython-311.pyc index 0cf54e788ce727ebabf2932495c0a4755175c31e..de3f1719a5a3ab483873e5fbca12f287fe93d3d0 100644 GIT binary patch delta 102 zcmX@fzKxxCIWI340}!Ymlt}x#kynDrE5gMpCOp3=TOpt*KPxr4q&OzOI5RIXJ|!zA xFSQ)ZPRUBlOV5Xhm!~GhB&MVkr4|<_<>zO|e2-N;wS;+5iJ6%(Fcl&ug@l%JKFTv8m9U!0kj7@v|A ylb2c!W~XE&=B4LD#LH8YViHqQic*VSU&srxGNQm#CYPm6(^Fub-D%4(3C-V0L+Gl73=JN>OTYaZ-MMwtjAAdQoCYW`16= K{^pY`RZIX=T`e2{ diff --git a/osinaweb/addressbook/migrations/__pycache__/0003_contact.cpython-311.pyc b/osinaweb/addressbook/migrations/__pycache__/0003_contact.cpython-311.pyc index 63e84b3321e48af2b24d967062d0e0e20018ba51..aa56649820faffa536cd190b7113ad2fe2c5f1e7 100644 GIT binary patch delta 102 zcmZ3_J%^ijIWI340}!Ymlt@e3$Xmed72#qP6P{m`tq@R@pOuHr(`AOrRPJ$%TtqL5>rx&Qj3d|^7FG}ax>G55=%1k^NM3O-(tSX2msAQC5`|9 delta 121 zcmbQky`GzQIWI340}wnd6;Jct$Xmc1o2?&OoLW?@pI@9=lANEb?~Hr(`AOrRPJ$%TtqL5>rx&Qj3d|^7FG}ax>G55=%1k^NM3Ow=*wb1OS=XByj)$ delta 121 zcmbQjwVaE0IWI340}wnd6;G4c$Scbno39^QoLW?@pI@9=lANEb?~G+{kCd6kDwyTAW%`te;<;S(2QetM8JZT$-DjS5mC+ zmspaRQwfsDOVmxtO3X{o*Uw8W2lJs^FuOc8Nk1_qr6{$yI4M6rTR%55y(qCHGe56b Ke{&a8CL;hLwk%cv diff --git a/osinaweb/addressbook/migrations/__pycache__/__init__.cpython-311.pyc b/osinaweb/addressbook/migrations/__pycache__/__init__.cpython-311.pyc index d5b0dd3611e6d1e6934bdff4d769566dd8595863..b8e81f9761dae1dda466f868e5f80e34b60b6d58 100644 GIT binary patch delta 97 zcmcb@c#x5MIWI340}!Yml$gkE>J{Q*6%(Fcl&ug@l%JKFTv8m9U!0kj7@v|Alb2c! sW~XE&=B4LD#LH8YViHqQic*Vh($ delta 116 zcmX@ec!iOBIWI340}wnd6`#m$8k?>kTAW%`te;<;S(2QetM8JZT$-DjS5mC+mspaR zQwfsDOVmxtO3X{o*Uw8W2lJs^FuOc8Nk1_qr6{$yI4M6rTR%55y(qCHGe56be`1$8 E03KW_egFUf diff --git a/osinaweb/billing/__pycache__/__init__.cpython-311.pyc b/osinaweb/billing/__pycache__/__init__.cpython-311.pyc index 47b48e1eabb021e3d74ce04e11a10502d84d2d25..fcaca624008f3d55586ef6b564e9e6f93532bf2a 100644 GIT binary patch delta 82 zcmX@gxQUT_IWI340}!Yml$gkEYVGP`6%(Fcl&ug@l%JKFTv8m9U!0kj7@v|Alb2c! dW~XE&=B4LD#LH8YVv;g*ax(MMVKCCOTAW%`te;<;S(2QetM8JZT$-DjS5mC+mspaR pQwfsDOVmxtO3X{o*Uw8W2lJs^FuOc8Nk1twCnqy6U4LS=IRLeOBo_bx diff --git a/osinaweb/billing/__pycache__/admin.cpython-311.pyc b/osinaweb/billing/__pycache__/admin.cpython-311.pyc index 6d3f67d606a89dd2e166929a657b2576b238dd0b..426b97b22945534ef269b9e7d616034b9b06a6c7 100644 GIT binary patch delta 86 zcmcb~evF-WIWI340}!Ymlt_!%$Xmx`?c`z=6P{m`tq@R@pOuHr(`AOrRPJ$%TtqLk}`90GV{`77T;uI1OU2<9*6({ delta 105 zcmX@cev_SdIWI340}wnd6;Jct$Xmzc7pfmxoLW?@pI@9=lANEb?~+R?=-COp3=TOpt*KPxr4q&OzOI5RIXJ|!zA hFSQ)ZPRUBlOV5Xhm!~GhBxUC0Wag#EOwM6E2LPAm9%KLj delta 105 zcmZ3^vWtaxIWI340}wnd6;GSAkynt>FGN4IIJKx)KfgG$Bso7<-z7h}G&eP`q*&iC tu_Q645+sqAsGE|Nn3tZfpO;z==0mw)c6n-&eo|&mPG(-Z{^Ur;a{x3-C3FA) diff --git a/osinaweb/billing/__pycache__/models.cpython-311.pyc b/osinaweb/billing/__pycache__/models.cpython-311.pyc index 635a7dca188cc293519a88f3acdcbbdd35804037..26944897fb4f553d3ac78cffca01d0ecfbb2d5e9 100644 GIT binary patch delta 1759 zcmaJ=T}&KR6rMZFF1y42!R}Cg7P^M=vmm5eh>Z|Z3MFl#g}Md{0hVEBpbN9R^v=*y z3IdTPYs7~3l7LUv2T{|cX+__((derQ)J?=m8cnPZJ{TeGgPLeOXSRS?^=9sO&pqed zbI!fzn=hMwJnnwaWVg12TU**r820F6 z3;V+wC7&|M)>7&TrY@vC!5ar}>z~!Hhr82ZY27op;TcSO24_#QyS6#>c;vqhNI=ZU@119mod>8;&=7u3vpJSR#k-dc1 z_yr-%(L8Vn5yLU8=n*|Rqf2UtH~6~4MpjH$;u;U;V36j(^1INa#xy;ejE^->R&`KW zp>=pFDp5QNC+nKjWK>eMW)OBfYvH6;1Tf33`x`Ug`&o-GFZJ(ksSC^@i{VPr83>Ab zBbuTc7D-hNi#8q)Stt_15R#bGtjn;P88y6U@Nt2Ldw)5T{(md78ct}>0nBpWi-l>i z@*A<{o>;RX)~3bU@|1Aj>&sMjTYz=L- z%}xq4xo2QIDP&S=(go!(+Z5g=em0TwR4J_jBMl+oDS8ONuxYxak8AW4`y!{T(y))w zoU8$iHk4mmP~ zyo8D{`_9`?+XbTL0045CW7hl!O!rCmUS-(m*0q-05(1r$u@?eh@z*GF!>7C$F)u@(YAH zbV3+pzvQ=*Id;oexYlu?gk(veWZNXb77D7!DEqjejwINFf)|fq3d7l^L}PJDZI3Cc zZ1$YuOBfDW(v`@V6q7TRneiu>Tv#Jq0Xs!F$KEP@hg?}}EOHUsIBH*Ir;E!AucP?J zj+c==CS8gv37vMch2kn<5e*3E+1=uEWRX<{sz{u528zT1G?~{m)0v4D*-W5BSOE)x zsV%eB!0X)y$TM5qlaOj(cwrm$kM@l9rKDktdlD9HOU`Z7KiV_45tdV0!#*sz{udIE B!kYj9 delta 1022 zcmZXTOH30{6oz{Xv~=tYAXI4S10o^?rSZ{(h#?|SG$=I^KvYu4=~Ro;7Vb=WxKId~ zU{GT`>K0uXF=3-Mig9a<3p5&VGclSNU1}h*F>&ENQ;adr;>&s6bIyNf=Ij0!dxiTv z&zacsHC-B;6CMf;=FXl#w<=RLkW%BClu86zQ&Ku1Cp9(DDQcoJhKZ!OJvtyJ&!hrL zdBpJ7UBe!cPX|uN6(ycL6Ua=M!#OVN5t6k-a`b72~lX}u~A%eAm%pCubX!?MC2qzm4KMqwRq`;w0R1Z1dw$dKA&cpc00C*`~%Kh@F^t3Tuw5sQK=uYWs?*I4?+f z7N^~rH=Ak+>4Kl7LDwKgwj%HhJ%=zxhv7h3HJ3ym5r)ySA(Dg>9w+2DACo>$p)YLiEEk_gylYIpN`nWdNf?ko0bGUPAN2 zpDOk-i(~kU&@jwyRU|vfpc!B9et{NtGmF7p#I^REsuNapV`Rl3iBIk&Ug2Evs^5 zm#nI-s7hp)t(sj|>k=v;S|k-(-ycgiBb9&Uf8Ydf;Tw;LsREOp1CeSjqX09JW)UTq zsR1*YF|}N#4$M@>jO8-pz)WY%L@qN4%uL2ixLE6F{~b;5K+3iLoCYHep&;s%st&R4X|WR zJ>E z6z59QlT)n{>glG%@kZo3<@g=dGeC&G^1Eq$O~8HX5121`F<_fpu=RLRCZ0vfa zYaN$qj2b=00MU|ib5;kIiIFR4~IaaE|n z1Hn!6D0BE5^chmom-`RywtsWk!OdsP-KU1f+b%a9T_gK#haN|E{OqxQOn2MKv$aKe znumXUkvDC)RTjO+mSIKse?r`Y-(gXbqyf6=kIn&F_VeZd-S$W40NwFNXWnW{J{p-r z1(m9&5B^*@TMnkTK0NaAb{}sCczamR0_Q)z0)3^AR|32;z%t;AXY1#iuev^N^>Hh} ztysNw_Tv2ai#tAE@8k6VuMg#TjT?WLg2l$Wx{tT|cq_nLG5#O&^)q_zUOe{kMjvkk zcq2K9U;X*r!(i=+|Kh;MRv%jdwxV^Cz*GO_WgyF0xu8MwSO2l<ZW8R z=B4NB=cSf|`A{yHU7nhxpOl%ClbM&UUs{w?tXEL^i^C>2KczG$)vib!=n|mo7>Z{z VOg_glnV*$~pQ(Wx1dBw0!T_2cIvfB1 diff --git a/osinaweb/billing/__pycache__/views.cpython-311.pyc b/osinaweb/billing/__pycache__/views.cpython-311.pyc index 48d7e8e09e6dd0a6c6378009ea468daf2f134322..50acd838078ac03bb2b927dfbaf47db51e53f1c4 100644 GIT binary patch literal 5368 zcmd5=O>7fM7Vfs&e`&{d95DGIi4y`D2ND8=1Sb3^5dJ1J1JMp-VH@Lah=YGJ)orpw z4jawxftApT!$@$*N;wSdAUNb0?P-o2yRDXNwS&}!b?VfT&ofBOt&m{J{Q{J?1$_H(pKQL2uq8BJH`hfbyI-vC;4>Tb9 zfd<8Tpdm2;v_T944T~Y5jbg)PCKi5+%ETOon@AZ^B1Xe)NfEL)XQTwYh%h)X7-J2u zl1xkU*^C5rAJ#=FrNrN|IFvQmULgMSayD~Gl4r9SSxR7!RoqZbJ;>>`TWpko&@xz2L|@#+d8hEI9Md z8C%w}r+S=K7oE>Q*B7?F%U-Le`n^s=F3*umd2YsM@#NV%R00{#v&vShm0@6h-ujyH zTQ!lJhqb(P)y_N*-3u?@ES`NQoRF$;|C}U!Rzh1Tn5iZ`(l%fPoX^_vDz<@W>Lm zn@mVBDxJ+`6vJzA8g5yMD>)fha*2c_%drN62WL1l**P4qNQUQfWwgh{qincuB~uE3 zv@S6nC$}X*mOx~d0B(hw_YBvqB#{-;0AdIprxCPu6cYCmDaijx;PWh+|HWqbJERgH9w5|Qy`=#ccWe-!|^>>D=5Bvj3 z8Oc9?s$=|3Pnwnwt4)0x->>uiD%ZaT3uJ1%4uT0!W$hCnkC`O1;H>sMd2qUUXRRFo z#vK#$O{t`;z-|k(@!OKTH>pTzxqn(or=GI}P3AdAqVO^}Kp^1f&K!Mv5`ZV^w~CB@ z2oIXu5!mo53u}qR?=L% z5^5*rQb-IYA-$+kt-fxPi3~tjH+FBX@X)G9<4@@P36(qX0fqkr62RdDwaR;k|4Ur_ zvhAX*@%R?kxuylD=*T;h>;k9Qjuu=hBRcckh6Cm%-Z}e{qTx+u?qVlD~=vKt%rAUS}f4~UHTLmZeuFgvgpdF3-ez#fB< zhrcTZy9&WBE!eFGyNkiTLa^_9Ned3@!NJ9|WjEt%d~~+#G~wc{z~#_tkH(+U`BN%) z>I1v~vA}PSi=qH%pG|=yl=s3{-z>?Bxr9RZ;%70#yy(+VCZEvXV_pM4sQi@ieJzTeuF6 zR#@R0f?HLh_$CK&=^w!N5$xXt--ZvTqZ5#0z=Hsn$AJLKLmhgkrx@B@2<_HFeR`;` z7#b>shE{S~=%^k#x_Ay@zU9%?^)NrYI;`=dIzOs%qvmngksAocC=K1i+7v`owNa%~ z#g}Javg@Nh1$|zn%-AkwxvJIb1vlb=s1as(ANj#OQpNf2#*5CE+`93cV#j(I`7L8? zu%U=9(Os)|t&|!W+2cp^FdUC-UR$gRcNwXXMc=#f9Eeo4-}#YR^4MeF)zCw8W$fB4 z4f>h>dQ%pf(5B<4tS`IK1Zi1Wu z1~3d4^@1_45vYU`f|+z!i3$WCJY@l!P~s`WkGYOu2K1uQXrq}XGeRbwmW;67NHYxD z7O>l-bUc}|WKt~0!loq+f<|Nlh~fJjlcaSv6~I(K5hseN3Hcn^zd(X^KyAt3a&SEw zbydpv-s|9^Q~!TLwy7n!lYWHSK_mLvPws>gZm&uXpU%JC2sxcPwS} z_I-N$NU5b`sb6pD(_0R_-q!l$LUDV4VSB%}eL&wnpl#cyZ`)UH@S&vw0ZWZwZt@{Z zMN6WVdIc&UXQ>e7Iv~n*Dpl4dq!&Ta1vI z_x8)vS)wFzicEuSswY?p&58SS3PJ&Q0RBq=!@)nJ%w*r4&ceS^vcXq4rxj(E0+Q?k zZkmG8w8jj@QC}MI(Qt*J^QQnKxT5D~_(#|L&U*v|=Tg!!G7VkeUm3XpXxYiKY>63C zH~W>CPPO(|V%pW(Uy0eOTE7z0t=9g^?l8Nz%-E!tV^6S<0KcaJjy*|RY#Q*eqtH@C sTR8R%<*_M@vg;rX>M&}IjF*dsW}dP0x!U#WMW!~g&Q delta 408 zcmZWjJxc>I7*3kIYg*e{Ech`v`2i=i(M1u&#p2jSD|p+riS;D8gCs|B6*nij!Ji5nS4`)aie%y~^0&gPxl+Tv;3s5?Lbg&YVN zKxlb^7X%7W&JlNn8@Pr$)aBl>%{^WeIKaj$UW1@S@e%M#Z?@QnV^6Y}GC6vR3ed^6 z(V_U-B(nej delta 117 zcmaDL@L7O&IWI340}wnd6;Io`k++&PGF?BkIJKx)KfgG$Bso7<-z7h}G&eP`q*&iC zu_Q645+sqAsGE|Nn3tZfpO;z==0mw)c6n-&eo|&mPG(-Zer{%ZQDRAEeqOQu=5wr* Fm;jeaD|i3^ diff --git a/osinaweb/billing/migrations/__pycache__/0002_service_active_service_cancelled_at_and_more.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0002_service_active_service_cancelled_at_and_more.cpython-311.pyc index c07e1072b946fb3e9041d61a6d2f3236d0a59516..c86fc14626e78aaf519b5cd4d9b8371f00e18b62 100644 GIT binary patch delta 98 zcmeC-`pL<=oR^o20SMF&N~BHS$a|E@t!rHr(`AOrRPJ$%TtqLk}`90GV{`7ax>G55=%1k^NM3O-(+!S0su^)Bar|A delta 117 zcmeC=o5RPuoR^o20SKO!il@!l$Xm=3S*9OaoLW?@pI@9=lANEb?~m diff --git a/osinaweb/billing/migrations/__pycache__/0004_rename_payment_paymenttype.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0004_rename_payment_paymenttype.cpython-311.pyc index 6c3998480036f56033034bcdf75b30d6929bc788..585a65d4f85413fa07c9986ddf689e741d7433f4 100644 GIT binary patch delta 98 zcmey&`hb;pIWI340}!Ymlt@e6$XmtemhNH|6P{m`tq@R@pOuHr(`AOrRPJ$%TtqLk}`90GV{`7ax>G55=%1k^NM3OKVTGQ1ORTaBeDPh delta 117 zcmaFB`k9q?IWI340}wnd6;BJ<$Xmr2S*0IZoLW?@pI@9=lANEb?~GoR^o20SMF&N~G~IZRB%ha!YZsiV4pz%2o&{%FjwoE-8-5FV4(Mj8Dmm u$xAHMv>NwL0P zVo737B}gJKQ8y(kF)uw|KQFZ$%!hKp?DEtk{iMvCoXos*{oKs-qQsKS{JdiQ&4-wF GGXemLi7S5q diff --git a/osinaweb/billing/migrations/__pycache__/0007_alter_service_recurring_cycle.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0007_alter_service_recurring_cycle.cpython-311.pyc index 2fda5ab223e86549fa41fbb3001d36636a123a66..5d3d0a2b5736a6a28dfc046fff5ca3fd38e1bbc8 100644 GIT binary patch delta 98 zcmcb?ag>91IWI340}!Ymlt{DN$Xm?hmgQm<6P{m`tq@R@pOuHr(`AOrRPJ$%TtqLk}`90GV{`7ax>G55=%1k^NM3O-(;$11OQL(BfbCt delta 117 zcmX@gaf5?*IWI340}wnd6;IRN$Xm=5S*ssfoLW?@pI@9=lANEb?~Hr(`AOrRPJ$%TtqLk}`90GV{`7ax>G55=%1k^NM3OKV-^a1OQ0NBc1>N delta 117 zcmdnSagu{~IWI340}wnd6;HF;$Xm@6S)?CYoLW?@pI@9=lANEb?~Hr(`AOrRPJ$%TtqLk}`90GV{`7ax>G55=%1k^NM3OuVP7J0svHr(`AOrRPJ$%TtqLk}`90GV{`7ax>G55=%1k^NM3OmoRBE0st;>BC`Mh delta 117 zcmeBTpUcj>oR^o20SKO!il?32$jiqRnX4aKoLW?@pI@9=lANEb?~EyTqtCOp3=TOpt*KPxr4q&OzOI5RIXJ|!zA tFSQ)ZPRUBlOV5Xhm!~GhBxUC0Wag#EMv>NwL0P zVo737B}gJKQ8y(kF)uw|KQFZ$%!hKp?DEtk{iMvCoXos*{oKs-qQsKS{JdiQ&0m?{ GGXem!Q7l0K diff --git a/osinaweb/billing/migrations/__pycache__/0013_alter_invoice_date_created.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0013_alter_invoice_date_created.cpython-311.pyc index c452c292168b476a10bfca03c8b8eaedd4a3231c..23bb2197ffb9f2ffa65977cc508d71b7cd8135dd 100644 GIT binary patch delta 98 zcmaFJc8-mAIWI340}!Ymlt^2-k@p;Mv>NwL0P zVo737B}gJKQ8y(kF)uw|KQFZ$%!hKp?DEtk{iMvCoXos*{oKs-qQsKS{JdiQ&5BIA Fi~y6WDsBJ( diff --git a/osinaweb/billing/migrations/__pycache__/0014_servicepayment_comment.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0014_servicepayment_comment.cpython-311.pyc index 9e138df46e40b515c6ade6f59f96e868c9457b01..e48455fd86bcc3e57ebf2d106d9700a4ac8aa6f1 100644 GIT binary patch delta 98 zcmaFHcA1TLIWI340}!Ymlt^2>k@q5_Te6E)On81#wn9KrepYI7NpVbmab{j(d`ebK tUTQg*osyN9m!1z1FHcR1Ny^O0$;?ZS$<0hJN-W9D&nu4EY|f<52mq3*Bc}iW delta 117 zcmcc2_Kb~pIWI340}wnd6;GSFk@q5FWSM?wacWVqetvOgNpgO!zDs^`X>Mv>NwL0P zVo737B}gJKQ8y(kF)uw|KQFZ$%!hKp?DEtk{iMvCoXos*{oKs-qQsKS{JdiQ%_>a# Fi~yLmDt-U} diff --git a/osinaweb/billing/migrations/__pycache__/0015_order.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0015_order.cpython-311.pyc index 11c23f77dd63500597bab83ac6128607472e52c1..7cfcfaef9c75e62176ef1ddf9b610febf2f49f21 100644 GIT binary patch delta 98 zcmZ3=Gl_?HIWI340}!Ymlt_EFk@p_6Tab%YOn81#wn9KrepYI7NpVbmab{j(d`ebK tUTQg*osyN9m!1z1FHcR1Ny^O0$;?ZS$<0hJN-W9D&nu4E?85Sp5de9{Br5;_ delta 117 zcmbQlvy_K-IWI340}wnd6;C_2k@p^RWU78>acWVqetvOgNpgO!zDs^`X>Mv>NwL0P zVo737B}gJKQ8y(kF)uw|KQFZ$%!hKp?DEtk{iMvCoXos*{oKs-qQsKS{JdiQ&4w%w F83B0mD*ONd diff --git a/osinaweb/billing/migrations/__pycache__/0016_alter_order_status.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0016_alter_order_status.cpython-311.pyc index 88e88c1d8caa2f50fd321fb26a443c655d6c3b2e..90c57d863b27a0487f139110e382fb112b9f7f75 100644 GIT binary patch delta 99 zcmX@ZzLTAAIWI340}!Ymlt^P^+Q=u$SU&srxGNQm#CYPm6(^Fub-D%4(3C-V0L+Gl73QVPEKZCx_)kEdQoCYW`16={^m@k G07d|12r5wk diff --git a/osinaweb/billing/migrations/__pycache__/0017_service_order.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0017_service_order.cpython-311.pyc index a7c5cd4a1252e97f8293f5146bf3e4530d92db02..b0e5d05464b38c2b2f36c14721cb0c901fd13f0e 100644 GIT binary patch delta 98 zcmey({(_x%IWI340}!Ymlt}x(k=KODEy~3zCOp3=TOpt*KPxr4q&OzOI5RIXJ|!zA tFSQ)ZPRUBlOV5Xhm!~GhBxUC0Wag#ESU&srxGNQm#CYPm6(^Fub-D%4(3C-V0L+Gl73QVPEKZCx_)kEdQoCYW`16={^mla G07d|CuPSr^ diff --git a/osinaweb/billing/migrations/__pycache__/0019_item_orderpayment_remove_service_customer_and_more.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0019_item_orderpayment_remove_service_customer_and_more.cpython-311.pyc index 23bc35e4f4dac98086905d5dfa2a3faebf1daed3..21f19f136f9e4ebdfac84503f56f37fc4b9b5783 100644 GIT binary patch delta 99 zcmX@FyhoXDIWI340}!Ymlt?oY*vOa4?N;w%6%(Fcl&ug@l%JKFTv8m9U!0kj7@v|A ulb2c!W~XE&=B4LD#LH8YVv;g*ax(MMV{$XoixNvR^Ye;hHlN{UW&;3c9V2}J delta 118 zcmdm^d|sJvIWI340}wnd6;C_NzmYGMJ93hKXmM&$v3`DWW=V2>uD(lta%paAUP-aO zUt&pOP9;bpFHtuoD={xUUq3Ik9L$Gu!R+$XB>kk!oSe+Obp71S^rFO)%>2A!{mnbM Gnb`oLe=7C> diff --git a/osinaweb/billing/migrations/__pycache__/0020_orderitem.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0020_orderitem.cpython-311.pyc index 2ded1aa86317cdb3d93a9708aaf9b85483826237..23ce0c80ec88b040cdfd9f5e2499947af46a9e9e 100644 GIT binary patch delta 98 zcmZ3e3 delta 117 zcmbQnwUUc>IWI340}wnd6;FG)kynyAGE+aaIJKx)KfgG$Bso7<-z7h}G&eP`q*&iC zu_Q645+sqAsGE|Nn3tZfpO;z==0mw)c6n-&eo|&mPG(-Zer{%ZQDRAEeqOQu<{ai# Fi~u~KDqR2o diff --git a/osinaweb/billing/migrations/__pycache__/0021_remove_item_recurring_cycle_and_more.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0021_remove_item_recurring_cycle_and_more.cpython-311.pyc index bf7486260b2a6c9bfe898539be0454325cd8e69b..a0c53c306656e806e1d221e310d4573b44dc97e4 100644 GIT binary patch delta 98 zcmeC?{K3JyoR^o20SMF&N~G0pZW8R=B4NB=cSf|`A{yHU7nhxpOl%ClbM&UpPQLplvt9PpI5BE`3ln# FMgUpuD*gZf diff --git a/osinaweb/billing/migrations/__pycache__/0022_remove_item_cancelled_at_remove_item_created_at_and_more.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0022_remove_item_cancelled_at_remove_item_created_at_and_more.cpython-311.pyc index 83d02ab5f3a2c1fd590a3b6e9d5f07274f200ad6..01325b476ad910ce97e42bed69297f738a5d44eb 100644 GIT binary patch delta 98 zcmX@dxto)BIWI340}!Ymlt{DK$h(Bet<}XUCOp3=TOpt*KPxr4q&OzOI5RIXJ|!zA tFSQ)ZPRUBlOV5Xhm!~GhBxUC0Wag#EMv>NwL0P zVo737B}gJKQ8y(kF)uw|KQFZ$%!hKp?DEtk{iMvCoXos*{oKs-qQsKS{JdiQ&EJ`h GFaiKm>?<+= diff --git a/osinaweb/billing/migrations/__pycache__/0023_alter_item_project_alter_item_type.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0023_alter_item_project_alter_item_type.cpython-311.pyc index 8020d6c0a582ed38ee6f6115c049b1f5d5bc7bf8..c5fa939751215b20c17f8cf3865d1e740ef6ce1b 100644 GIT binary patch delta 98 zcmX@hwTp{)IWI340}!Ymlt>HO$Sce2mhWN}6P{m`tq@R@pOuHr(`AOrRPJ$%TtqLk}`90GV{`7ax>G55=%1k^NM3OH#47N1OPTZBW3^q delta 117 zcmdnRb(V{FIWI340}wnd6;HF=$Scbn*`yy@oLW?@pI@9=lANEb?~Hr(`AOrRPJ$%TtqLk}`90GV{`7ax>G55=%1k^NM3OKVsx&1ORCRBb)#L delta 117 zcmcb``j(Y$Xml0S)?CYoLW?@pI@9=lANEb?~?Mj3sNa9(9)`qC5jMb0EASvX%T-a1O-GCadL8($gX1t+i6v% z4h)PPkopY@s2SiJfW!yrkRiI2iOp3rb>iJQPF0n&@8|dD?%jL8d;XHk=?KQnUzh7Y zWQ6{3B_64PaJ&q{9wLZHHfl;`sVSFbiR-eRC?{pKib&!kB1tM)@gB6FK%oX9T9}_)KZKgxdaEZLn5+G6Utf1HvAns4NjwmWf2vyqjJZA9&8`$>ooGa4QJ zY=w|jj%1+5EYqIF#X+T->zj^Ib3Mvtip9GN*sufY;ab}d+$Qx}o?ACz|AMT98~I!0I*cuq&8X0k1!RBb1-H)#&B_M z$Q`pR#_!vP&ClieNi?d%Oo&=7p$Zg@)GQ3$7a9IeP93i`uE#z=~cJ% zu3M^y2-(uA44;dSVxRUAA0kkN-+H@K$wsu32K+}hv?S%w}++=<2O`BB_%}X RVOQ^7m^xR;T8IWI340}!Yml$gkE>K5Q)6%(Fcl&ug@l%JKFTv8m9U!0kj7@v|Alb2c! oW~XE&=B4LD#LH8YVv;g*ax(MMV{$XoixNvR^Ye;hCeAbm0GS~n(EtDd delta 112 zcmdnXc!807IWI340}wnd6`#m$8kwvgTAW%`te;<;S(2QetM8JZT$-DjS5mC+mspaR zQwfsDOVmxtO3X{o*Uw8W2lJs^FuOc8Nk1twCnqy6T|YN7y(qCHGe56be`1?C0B;T` Ax&QzG diff --git a/osinaweb/billing/templates/add_templates/add-order.html b/osinaweb/billing/templates/add_templates/add-order.html new file mode 100644 index 00000000..313ee4c8 --- /dev/null +++ b/osinaweb/billing/templates/add_templates/add-order.html @@ -0,0 +1,85 @@ +{% extends "add-edit-main.html" %} +{%load static%} +{% block content %} + + + + + + + +
+
+

+ Add Order +

+ +
+ {% csrf_token %} +
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ + +
+ + +
+ +
+ +
+
+
+
+
+ + + + + + +{% endblock %} \ No newline at end of file diff --git a/osinaweb/billing/templates/add_templates/add-product.html b/osinaweb/billing/templates/add_templates/add-product.html new file mode 100644 index 00000000..23c71010 --- /dev/null +++ b/osinaweb/billing/templates/add_templates/add-product.html @@ -0,0 +1,72 @@ +{% extends "add-edit-main.html" %} +{%load static%} +{% block content %} + +
+
+

+ Add Product +

+ +
+ {% csrf_token %} +
+
+ + +
+ + +
+ + +
+ + +
+ + +
+ +
+ + +
+ +
+ + +
+ + +
+ + +
+ +
+ +
+
+
+
+
+ +{% endblock %} \ No newline at end of file diff --git a/osinaweb/billing/templates/add_templates/add-service.html b/osinaweb/billing/templates/add_templates/add-service.html new file mode 100644 index 00000000..8635a7e8 --- /dev/null +++ b/osinaweb/billing/templates/add_templates/add-service.html @@ -0,0 +1,72 @@ +{% extends "add-edit-main.html" %} +{%load static%} +{% block content %} + +
+
+

+ Add Service +

+ +
+ {% csrf_token %} +
+
+ + +
+ + +
+ + +
+ + +
+ + +
+ +
+ + +
+ +
+ + +
+ + +
+ + +
+ +
+ +
+
+
+
+
+ +{% endblock %} \ No newline at end of file diff --git a/osinaweb/billing/templates/invoice-details.html b/osinaweb/billing/templates/invoice-details.html new file mode 100644 index 00000000..5ae80e2f --- /dev/null +++ b/osinaweb/billing/templates/invoice-details.html @@ -0,0 +1,30 @@ +{% load static %} + + + + + + + + + Invoice Details + + + + +
+ + +
+

Bill To: Winabig

+

Customer Details: 036466464

+
+ + +
+ +
+
+ + + \ No newline at end of file diff --git a/osinaweb/billing/templates/listing_pages/invoices.html b/osinaweb/billing/templates/listing_pages/invoices.html new file mode 100644 index 00000000..a628b223 --- /dev/null +++ b/osinaweb/billing/templates/listing_pages/invoices.html @@ -0,0 +1,97 @@ +{% extends "main.html" %} +{%load static%} +{% block content %} + + + + +
+
+

Invoices

+ +
+
+
+ + +
+
+
+ + + +
+
+ +
+ + + + + + + + + + + + + + + {% for invoice in invoices %} + + + + + + + + + + + + {% endfor %} + +
+ Invoice Number + + Customer + + Order + + Date Created + + Actions +
+

{{invoice.invoice_number}}

+ 		+

{{invoice.order.customer}}

+ 		+

{{invoice.order.id}}

+ 		+

{{invoice.date_created}}

+ 		+
+ +
+
+
+
+
+ + +{% endblock %} \ No newline at end of file diff --git a/osinaweb/billing/templates/listing_pages/items.html b/osinaweb/billing/templates/listing_pages/items.html new file mode 100644 index 00000000..981e953c --- /dev/null +++ b/osinaweb/billing/templates/listing_pages/items.html @@ -0,0 +1,183 @@ +{% extends "main.html" %} +{%load static%} +{% block content %} + + +
+
+
+ +
+

Products

+

Services

+
+ +
+ + + + + + + +
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Title + + Customer + + Type + + Amount + + Actions +
+

Item 1

+ 		+

Nataly

+ 		+

Type

+ 		+

222

+ 		+
+ +
+ +
+ + +
+ +
+ +
+ +
+
+
+
+ + + + +
+
+ + + + + + + +{% endblock %} \ No newline at end of file diff --git a/osinaweb/billing/templates/listing_pages/orders.html b/osinaweb/billing/templates/listing_pages/orders.html new file mode 100644 index 00000000..d76197d9 --- /dev/null +++ b/osinaweb/billing/templates/listing_pages/orders.html @@ -0,0 +1,100 @@ + +{% extends "main.html" %} +{%load static%} +{% block content %} + +
+
+

Orders

+
+
+
+ + +
+
+
+ + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Order ID + + Customer + + Due Date + + Status + + Actions +
+

1

+ 		+

Nataly

+ 		+

10-2-2014

+ 		+

Paid

+ 		+
+ + + +
+ +
+ +
+ +
+
+
+
+
+
+ + +{% endblock %} \ No newline at end of file diff --git a/osinaweb/billing/urls.py b/osinaweb/billing/urls.py index 1d9f7d1e..44891bcc 100644 --- a/osinaweb/billing/urls.py +++ b/osinaweb/billing/urls.py @@ -10,4 +10,22 @@ urlpatterns = [ path('check', views.create_charges_for_recurring_services, name='check'), + # LISTING + path('items', views.items, name='items'), + path('orders', views.orders, name='orders'), + path('invoices', views.invoices, name='invoices'), + + + # ADD + path('add-product', views.add_product, name='addproduct'), + path('add-service', views.add_service, name='addservice'), + path('add-order', views.add_order, name='addorder'), + + + path('fetch-customer-items//', views.fetch_customer_items, name='fetch_customer_items'), + path('fetch-invoice-details//', views.fetch_invoice_details, name='fetchinvoicedetails'), + + + path('invoice-details//', views.invoice_details, name='invoicedetails'), + ] diff --git a/osinaweb/billing/views.py b/osinaweb/billing/views.py index 2b68868d..518dcc22 100644 --- a/osinaweb/billing/views.py +++ b/osinaweb/billing/views.py @@ -1,12 +1,9 @@ -from django.shortcuts import render +from django.shortcuts import render, get_object_or_404 from django.utils import timezone from datetime import timedelta from .models import * from django.http import JsonResponse -# Create your views here. - -# Create your tests here. def create_charges_for_recurring_services(request): today = timezone.now().date() @@ -26,4 +23,108 @@ def create_charges_for_recurring_services(request): amount=service.amount, due_date=new_due_date ) - return JsonResponse({'status': 'success'}) \ No newline at end of file + return JsonResponse({'status': 'success'}) + +# LISTING +def items (request, *args, **kwargs): + context = { + + } + return render(request, 'listing_pages/items.html', context) + + +def orders (request, *args, **kwargs): + context = { + + } + return render(request, 'listing_pages/orders.html', context) + + +def invoices (request, *args, **kwargs): + invoices = Invoice.objects.all().order_by('-id') + + context = { + 'invoices': invoices, + } + + return render(request, 'listing_pages/invoices.html', context) + + + + +# ADD +def add_product (request, *args, **kwargs): + context = { + + } + return render(request, 'add_templates/add-product.html', context) + + +def add_service (request, *args, **kwargs): + context = { + + } + return render(request, 'add_templates/add-service.html', context) + + +def add_order (request, *args, **kwargs): + customers = CustomerProfile.objects.all().order_by('-id') + + context = { + 'customers': customers, + } + + return render(request, 'add_templates/add-order.html', context) + + + +# TO FETCH THE ITEMS RELATED TO TH SELECTED CUSTOMER AND THE ITEMS THAT ARE NOT RELATED TO A CUSTOMER +def fetch_customer_items(request, customer_id): + customer = get_object_or_404(CustomerProfile, id=customer_id) + + items_related_to_customer = Item.objects.filter(customer=customer) + + items_without_customer = Item.objects.filter(customer__isnull=True) + + data = { + 'items_related_to_customer': list(items_related_to_customer.values('id', 'title')), + 'items_without_customer': list(items_without_customer.values('id', 'title')), + } + + return JsonResponse(data) + + + + +def fetch_invoice_details(request, invoice_id): + invoice = get_object_or_404(Invoice, id=invoice_id) + order = invoice.order + order_items = OrderItem.objects.filter(order=order) + + order_total = order.get_cart_total + + data = { + 'invoice_number': invoice.invoice_number, + 'order_id': order.order_id, + 'order_total' : order_total, + 'date_created': invoice.date_created, + 'customer_first_name': order.customer.user.first_name, + 'customer_last_name': order.customer.user.last_name, + 'customer_email': order.customer.user.email, + 'order_items': list(order_items.values()), # Convert QuerySet to list of dictionaries + } + + return JsonResponse(data) + + + +def invoice_details (request, invoice_id): + invoice = get_object_or_404(Invoice, id=invoice_id) + + context = { + 'invoice' : invoice, + } + + return render(request, 'invoice-details.html', context) + + diff --git a/osinaweb/customercore/__pycache__/__init__.cpython-311.pyc b/osinaweb/customercore/__pycache__/__init__.cpython-311.pyc index dfc13ddb0da634c8d4122bb95a8efe061829aaa1..ee0c689f665ae18904c50150245142b07d75643c 100644 GIT binary patch delta 87 zcmX@bxSf%EIWI340}!Yml$gkE>fq&K6%(Fcl&ug@l%JKFTv8m9U!0kj7@v|Alb2c! iW~XE&=B4LD#LH8YVv#|1%u9?<$%@HK kEeEqxvJ&&s^C9BpsYx-(rNt%rxv53T`9-NQ6Zbm-01P=GO#lD@ delta 108 zcmaFI*vQ1YoR^o20SKO!il^C6eeTv}X`pPO2goL`ixKXHu{0LCLHU;qFB diff --git a/osinaweb/customercore/__pycache__/apps.cpython-311.pyc b/osinaweb/customercore/__pycache__/apps.cpython-311.pyc index facad0ab601dfa661db095361b5b601e81c5d976..5293bac72ddbccdc02cf1dd7340ade81f49c8616 100644 GIT binary patch delta 91 zcmX@fvWQF4A!s{Z5*#&ZA=NGJIK diff --git a/osinaweb/customercore/__pycache__/decorators.cpython-311.pyc b/osinaweb/customercore/__pycache__/decorators.cpython-311.pyc index 755ef7d65b93af57bf759aad9d842bc3eb90bd22..cf25e39bb23cebfde2da19522bbd82c2204b41f6 100644 GIT binary patch delta 92 zcmX@Zv6F*$IWI340}!Ymlt`1?$oreo!NQF4A!s{UpVrjLvOT}>#5 diff --git a/osinaweb/customercore/__pycache__/models.cpython-311.pyc b/osinaweb/customercore/__pycache__/models.cpython-311.pyc index f9ad7a8442e06d6fa65565ec3614f908cceef3ad..46c9c4b86b593eab13378a61b5518f4a79bd4e52 100644 GIT binary patch delta 89 zcmeyz_?nS-IWI340}!Ymlt{Cg$Q$k8;bIjNo?n!$5Kxq#m6}{q9Ft$1nU@%!k`YlyIWI340}wnd6;HFA$QvCTtsh#PT2!o`Uz}NzoS&=jlAm0fo0?ZrtnZgt wl9*EolE_QcP032kOV8KOODzZUpKR2}~Ilm}Xf8q*f0QChY%>V!Z diff --git a/osinaweb/customercore/__pycache__/urls.cpython-311.pyc b/osinaweb/customercore/__pycache__/urls.cpython-311.pyc index 808ab60f712239fa773364c3001634f49aaa6a4f..9ff4c1d00ea6fa3275e0c744615768b2aabba4e1 100644 GIT binary patch delta 144 zcmcb}d4iK~IWI340}xzRmQ0gi-pE(O$R(6qT3nK!n_8s1xts9>V~m@NRZMt(QMN)r zQGQlxa!GMaesN}AVth(gOkQd^n4OZ9n3tXp5id_oih-GsoL`h0Q(BZ$tXEL^i^C>2 fKczG$)vibyXdxpI7jsNL#B4mdmql_iFUt`Ct3fdm delta 148 zcmX@Xd6AQEIWI340}v?O6i@rkw2`ldk&$!r6vh*b!IAo*#i>Qb`uW9~CCT}@`Y!p& zrManjCB^!Fi6x0Sl^}_{MBS9E#Ju!;{k+t2FdxbVv&&PH^pi`AOY(D5i<0w;QuQa# mVU}iOpS*+FShz!aLh2PU-3ume7g*dcvbbMiai9F3`6K|lCpBXL diff --git a/osinaweb/customercore/__pycache__/views.cpython-311.pyc b/osinaweb/customercore/__pycache__/views.cpython-311.pyc index 9ff2c7695a5feb854288c7c5c444bd0809c554d9..46870cce2cd59843000deffb35787ac0d0bfaa1a 100644 GIT binary patch delta 1333 zcmZuwUuauZ7{BNKOZw*~P1-bR(xyr0RxY(GRi>j9+pczYo2}cjIcqb!H21VkmgL6o z-mtBt*!ds~`yd=pUxYr@Ne3eF!3R+XKKLTGQcy1p=HtMJ%s(I^==pBUK-dT8cYo(Q z=lkw=&i6ZaCqA9>eW+=z0=L1tk(D#upZNYElP^3!mcC@d)x=pa^E7K)Y17J;GD}82 zU82`qZsaqiRkPv0Mwipsie;Nc3Rx3qx^_j3k!RlGN#7HyLLRfbmM2ZNA=z@13qoFM z@@<)s_Rt%WLGFkM0894SFp=AD*lvsf-r zn;N?4c$?)ps%2;Fish!<7afkMu*bEVa#a%PoUBaMCRE6I0RR~@-xQE>dt;4+vi zxdL^RmoV1xn9J_vI4bwr6aXvGRcPlQ&=7nGVT2w8KL<tJB08AGgVy~mImmwXygPXq_qip@Zpn@(XVc?8Ms6u%n7UwLKHX0Fx<07GuRhLTBSC)CAvrK<%{fk z@B*1*-v(15_fC&ulw0crvITambAp^>mCj>Ifjcs_k2|B1@=MjTt+I11UF?eDuRZLh zWX|yKa3StK5@Sj*I;x(0fCss@&T&Jt@$dhc5vXc8Vg&DW{$G?llGU{?&&Y<)=(2V8 zMI;$|Y#94JG9-uQVVoW6StAQJ%`VyxEC%UoaeCKHgi2o%XZEzjV1ID;B_^$@iH=O5-cJtad70k zWtJKpdIg=YBE*>$eR{_60yT2L-#omAUQ{b&I5?7JgYIvL+d%IELe^cXK*6mQ+#{{A zpQ8z~!o=87a+Qt7Mq6+4UGMW@ea8y10_kEu#rFOE+ur@Keh}98I`kiVC)wA%NngEB zXdm2bJM!lraiKlL9`r7g5%yvqkVW=oUxGZv?)MFj;gbQBHlV0oF*Z(!T?hQvM*;+q zqiX;1ju%a%QlQVlEjAVZJlaA|le&QTP!hzR0}`o=u5W;a`)?)VuVo#-)$I8 ziI~j7WZa#Zjd9^dj8S7uXEBRe=+0NKA~G&3I0M#Dyn0U(U}x_uSvV z4?Y_8-}3ny6_n7+$aF0H!2dtfPNydpmF%GsTI zF(XP(Q&F z&(>PV+3aYw-Da-H^U|_i(*;9v0o&Z2O;H>qVuTLR+$m=lntip)?nBJijplyJL=f=N zbDhQE4{tl`g`3`_GljuS?XmYNbM8iSvUaBFS2fjxrmc>fWu9`_E=y)*#j-sc3&xn! z6gn58xAq~Bao|)V!2|3HRD-A35Ihgg?zPnlo{$~bD47!`u9n;GS)Rp0%WjzAQpB;1 z=%ilGV>BP++fK5h@K2i-9;Vb*LN8&2FbT=fD9gZ9Xpi$e2F}&4g`y44m8$!O3;KPV zYp){H>{8XU#1!QY>Y8YZuAm00?qcgk>>?TqK1rvvE_zGVS73VU-Qbb~t5MfPQ@Rzo zWy4dHEs97l`1LkP%UYMJ|C^5Ru)Q(--HG9C`*t-nF7|>yI?EZyt_)-I>MlNopsOEM0hV|}a$Jstgxi#X~pRBIWgIt&(uryVQN?i-nv$iVZ+ zz;esLYFKIcX*n>sx=D#2WNK*E06%(Fcl&ug@l%JKFTv8m9U!0kj7@v|Alb2c! tW~XE&=B4LD#LH8YVv - {% endblock %} \ No newline at end of file diff --git a/osinaweb/customercore/templates/listing_pages/products.html b/osinaweb/customercore/templates/listing_pages/products.html index 495108a7..8b316428 100644 --- a/osinaweb/customercore/templates/listing_pages/products.html +++ b/osinaweb/customercore/templates/listing_pages/products.html @@ -3,19 +3,10 @@ {% block content %} - - - -
+ class="w-full bg-secondosiblue shadow-md rounded-md px-5 py-5 flex flex-wrap items-center gap-8 text-fifthosiblue text-base xl:text-xl uppercase">

Solutions

Cloud Hosting

@@ -24,7 +15,7 @@
- +
-
+
-

Shared Basic

+

Shared + Basic

-
-

80%

-

$2.40/month

+
+

80%

+

$2.40/month

Regular Price: $12.00/month

-
- -
-

Shared Plus -

- -
-

80%

-

$3.50/month

-

Regular Price: $17.50/month

-
+
+

Shared + Plus +

+ +
+

80%

+

$3.50/month

+

Regular Price: $17.50/month

-

Shared Power

+

Shared + Power

-
-

80%

-

$4.80/month

+
+

80%

+

$4.80/month

Regular Price: $24.00/month

@@ -175,7 +167,7 @@
-

Cloud VPS Hosting

+

Cloud VPS Hosting

-
+
-

OSICLOUD 1

+

+ OSICLOUD 1

-
-

30%

-

$46.16/month

+
+

30%

+

$46.16/month

Regular Price: $65.95/month

-
- -
-

OSICLOUD 2

+
+

+ OSICLOUD 2

-
-

30%

-

$53.86/month

-

Regular Price: $76.95/month

-
+
+

30%

+

$53.86/month +

+

Regular Price: $76.95/month

-

OSICLOUD 3

+

+ OSICLOUD 3

-
-

30%

-

$69.26/month

+
+

30%

+

$69.26/month

Regular Price: $98.95/month

-

OSICLOUD 4

+

+ OSICLOUD 4

-
-

30%

-

$107.76/month

+
+

30%

+

$107.76/month +

Regular Price: $153.95/month

@@ -236,7 +231,7 @@
-

Dedicated CPU Servers

+

Dedicated CPU Servers

-
+
-

DEDICATED 1

+

+ DEDICATED 1

-
-

30%

-

$103.06/month

+
+

30%

+

$103.06/month +

Regular Price: $143.95/month

-
- -
-

DEDICATED 2 -

- -
-

30%

-

$127.16/month

-

Regular Price: $184.95/month

-
+
+

+ DEDICATED 2 +

+ +
+

30%

+

+ $127.16/month

+

Regular Price: $184.95/month

-

DEDICATED 3

+

+ DEDICATED 3

-
-

30%

-

$173.63/month

+
+

30%

+

$173.63/month +

Regular Price: $252.95/month

-

DEDICATED 4

+

+ DEDICATED 4

-
-

30%

-

$265.76/month

+
+

30%

+

$265.76/month +

Regular Price: $374.95/month

@@ -298,26 +298,8 @@
- + + + {% endblock %} \ No newline at end of file diff --git a/osinaweb/customercore/urls.py b/osinaweb/customercore/urls.py index 6329673c..1942a491 100644 --- a/osinaweb/customercore/urls.py +++ b/osinaweb/customercore/urls.py @@ -5,7 +5,7 @@ from . import views urlpatterns = [ # LISTING - path('invoices/', views.customer_invoices, name='customerinvoices'), + path('customer-invoices/', views.customer_invoices, name='customerinvoices'), path('products/', views.all_products, name='products'), path('orders/', views.customer_orders, name='orders'), diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index 73087dbbad558c0b637cb646846d1f2ef8dd8fdb..dbd97d24601400a836584201113bf374983c94cf 100644 GIT binary patch delta 3609 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 diff --git a/osinaweb/input.css b/osinaweb/input.css index b8027e9e..2d36a1b7 100644 --- a/osinaweb/input.css +++ b/osinaweb/input.css @@ -226,4 +226,19 @@ /* CUSTOMER DASHBOARD PAYMENT */ #paymentContent iframe { min-height: fit-content !important; +} + + +/* CUSTOMER DASHBOARD PRODUCTS PAGE */ +.selectedProductCategory { + color: white; + font-weight: bolder; +} + + + +/* IN BILLING ITEMS */ +.selectedItemType { + color: white; + font-weight: bolder; } \ No newline at end of file diff --git a/osinaweb/osinacore/__pycache__/__init__.cpython-311.pyc b/osinaweb/osinacore/__pycache__/__init__.cpython-311.pyc index 91d0d094e9abc683177f338c6e7f806f7f1cd0b2..166645a7b2add212ca480773a863c2e47f0e9a10 100644 GIT binary patch delta 84 zcmX@kxP_5>IWI340}yB&l$gkEYU}P|6%(Fcl&ug@l%JKFTv8m9U!0kj7@v|Alb2c! aW~XE&=B4LD#LH8YAdKYvqSTm)6U+f`dmZio delta 103 zcmdnOc$|@YIWI340}wnd6`#m$8W5!)TAW%`te;<;S(2QetM8JZT$-DjS5mC+mspaR nQwfsDOVmxtO3X{o*Uw8W2lJs^FuOc838E-DzbI9IVy!s<0}>?z diff --git a/osinaweb/osinacore/__pycache__/admin.cpython-311.pyc b/osinaweb/osinacore/__pycache__/admin.cpython-311.pyc index 1a63ee5d9fb699afd8c0dc66c00a19ea14592a12..39d76076912f035bcdc74f2974ae399084bad905 100644 GIT binary patch delta 89 zcmdlgy-1pOIWI340}yB<`=F$Q#CL>*8V+6P{m`tq@R@pOuHr(`AOrRPJ$%TtpejO6^H)R@hiS(!Kh5IrA8 delta 108 zcmZ1^y;YibIWI340}wnd6;Jcs$Q#BQ5Uw9uoLW?@pI@9=lANEb?~COp3=TOpt*KPxr4q&OzOI5RIXJ|!zA fFSQ)ZPRUBlOV5Xhm!~E{7|HoXsWFp_7|#I!-Y_3! delta 107 zcmZ3>a)5<*IWI340}wnd6;GSCkyn&4AWT2BIJKx)KfgG$Bso7<-z7h}G&eP`q*&iC ru_Q645+sqAsGE|Nn3tZfpO;z==0mw)c6n+NL{V~nQL6src*b)8im@hi diff --git a/osinaweb/osinacore/__pycache__/custom_context.cpython-311.pyc b/osinaweb/osinacore/__pycache__/custom_context.cpython-311.pyc index 4e7e6d9adc4d2bdc605a618f8cd9beb8e390d019..f3c083946709fd9381fbffa6c14058d20295480d 100644 GIT binary patch delta 90 zcmdmCy3~|!IWI340}yB<`-**~oXA+1A&^DkeO?C|e<*C_gJTxuiHIzc@25F+L?L gCNH%d%udNl%uCOQh?l1(K^V#TMX52HHCg(_08Qo~9smFU delta 109 zcmZ2#y2F%jIWI340}wnd6;JymypiuTb3lTAXmM&$v3`DWW=V2>uD(lta%paAUP-aO tUt&pOP9;bpFHtuoD={xUUq3Ik9L$Gu!R+$XB#5Hq{GwF-&0;M5VgN-&C$azl diff --git a/osinaweb/osinacore/__pycache__/decorators.cpython-311.pyc b/osinaweb/osinacore/__pycache__/decorators.cpython-311.pyc index f6e6e037a032454447f68ef407a7fcf3c262c724..e4c6d2a54060ee912ac2234057e7d9311fd1f6fe 100644 GIT binary patch delta 89 zcmdnZv4VqlIWI340}yB<|;>$orSk*3-o*COp3=TOpt*KPxr4q&OzOI5RIXJ|!zA gFSQ)ZPRUBlOV5Xhm!~E{7|HoXsWF?Qm>x0$02RU?;Q#;t delta 108 zcmZ3%v73W;IWI340}wnd6;ET@$orQuAVxp5IJKx)KfgG$Bso7<-z7h}G&eP`q*&iC su_Q645+sqAsGE|Nn3tZfpO;z==0mw)c6n+NL{V~nQL6rCcczDo0L{}T=>Px# diff --git a/osinaweb/osinacore/__pycache__/forms.cpython-311.pyc b/osinaweb/osinacore/__pycache__/forms.cpython-311.pyc index 036921eb51b0f63366a97be68791a8f0a9ef7de3..6491adf0c1cb2b4599a4ba1ac1eb3738def91019 100644 GIT binary patch delta 89 zcmZ3>K8u}qIWI340}yB<>HO$a|g9*2TptCOp3=TOpt*KPxr4q&OzOI5RIXJ|!zA fFSQ)ZPRUBlOV5Xhm!~E{7|HoXsWF>Pm?{|o5nLZl delta 108 zcmbQmzLuSLIWI340}wnd6;E^D$a|eJAY4DRIJKx)KfgG$Bso7<-z7h}G&eP`q*&iC su_Q645+sqAsGE|Nn3tZfpO;z==0mw)c6n+NL{V~nQL6rCMW#wd0Lif?R{#J2 diff --git a/osinaweb/osinacore/__pycache__/models.cpython-311.pyc b/osinaweb/osinacore/__pycache__/models.cpython-311.pyc index 893a7db664955738f6c05ba892ae0b3ae482b022..3bb5fd90e0f1812cebf6e1e1b51197fc170ae176 100644 GIT binary patch delta 92 zcmbQVneqQ7M!w~|yj%=Gpm9(lP1bB99|x)r>YB`vll9ia3o(~Z(Pfda_lJkpFV>YL;>VyCQbQBsCF)S_bj{Nl`#HR$a{$2*4f1>COp3=TOpt*KPxr4q&OzOI5RIXJ|!zA fFSQ)ZPRUBlOV5Xhm!~E{7|HoXsWF@71d$a{!CAWT2BIJKx)KfgG$Bso7<-z7h}G&eP`q*&iC su_Q645+sqAsGE|Nn3tZfpO;z==0mw)c6n+NL{V~nQL6rC9szS!0Prd%W&i*H diff --git a/osinaweb/osinacore/__pycache__/views.cpython-311.pyc b/osinaweb/osinacore/__pycache__/views.cpython-311.pyc index 0412cbfc9a257ff99568a106865f217613af1172..56bb59cbe41b95ead75c9d674ffb3a61ca7f0334 100644 GIT binary patch delta 92 zcmcb8j`74fM!w~|yj%=Gpm9(l?XCMpJ{~q(7ZN~9g$$a|XI(cQ%=COp3=TOpt*KPxr4q&OzOI5RIXJ|!zA jFSQ)ZPRUBlOV5Xhm!~E{7|HoXsWFKuDKVRMIFgwF*MK36 delta 112 zcmew((l5%poR^o20SKO!il;5!$a|VSBuYQDIJKx)KfgG$Bso7<-z7h}G&eP`q*&iC wu_Q645+sqAsGE|Nn3tZfpO;z==0mw)c6n+NL{V~nQL27oN{aqwNseSD0JH!oQ~&?~ diff --git a/osinaweb/osinacore/add/__pycache__/views.cpython-311.pyc b/osinaweb/osinacore/add/__pycache__/views.cpython-311.pyc index bb24212294e8f1e1d9bbd22d998fee97c54b4061..7128939f54b42102de80297863367510d28730ab 100644 GIT binary patch delta 96 zcmZoW&iMHlBj0jfUM>b8&^RcOcFbcVpEaAKhl^EAcz#i~LO@Y|R%&udaZG-3W?o`^ nN>)r>YB`vll9ia3o(~Z(Pfda_lJkpFV-izRVm8lZdl>@&OSdEJ delta 115 zcmex-jIr%FBj0jfUM>b8cv>o+=H#}K&zdbHT0gWnwWwG>zc{lbIX_q5B|o_|H#M)M zSl=(PBr&HFB$1b>o0657m!7Ymms$?yL%Cpfd1?|wQF4A!s(xZhivH#{>8<+oR^o20SGh>N~EpW$h(!%(a*&yCOp3=TOpt*KPxr4q&OzOI5RIXJ|!zA jFSQ)ZPRUBlOV5Xhm!~E{7|HoXsWFKKnK7Hin97*}!6qS2 delta 112 zcmeyx)yvJhoR^o20SKO!il@!l$h(y>BvC)KIJKx)KfgG$Bso7<-z7h}G&eP`q*&iC wu_Q645+sqAsGE|Nn3tZfpO;z==0mw)c6n+NL{V~nQL27oL8ks@W~Opx0H3-jDgXcg diff --git a/osinaweb/osinacore/api/__pycache__/urls.cpython-311.pyc b/osinaweb/osinacore/api/__pycache__/urls.cpython-311.pyc index 368a9f9ea1f35e71e95cea425011c54a18d98802..c1b606a4796b29bed9c8070ed16ef2d60bc538ac 100644 GIT binary patch delta 91 zcmZ3_JcpTgIWI340}yB<`N~k@t?HyNgv!cz#i~LO@Y|R%&udaZG-3W?o`^N>)r> iYB`vll9ia3o(~Z(Pfda_lJkpFV-gE8VHr(`AOrRPJ$%TtpejO6^H)R@GA%$Us+Sg$hy0GQ+{SgjcW|JEV0 delta 116 zcmdnRbC!p1IWI340}wnd6;J!eypeA$OL(k)XmM&$v3`DWW=V2>uD(lta%paAUP-aO zUt&pOP9;bpFHtuoD={xUUq3Ik9L$Gu!R+$XB#5Hq{GwF-l+>Kml2rZ8|5>aV0ZhFr AhX4Qo diff --git a/osinaweb/osinacore/delete/__pycache__/views.cpython-311.pyc b/osinaweb/osinacore/delete/__pycache__/views.cpython-311.pyc index e87003b552791d8934e21c5f594bafdc77bc0e10..0f3fb2aea4a847d4d667bfa1159d5bce931c320c 100644 GIT binary patch delta 96 zcmaE-ds~-xIWI340}yB<|mWkynb@#oNUyCOp3=TOpt*KPxr4q&OzOI5RIXJ|!zA mFSQ)ZPRUBlOV5Xhm!~E{7|HoXsWB<3IjJS7F`Mg{3xokP=OXd| delta 115 zcmcbu`%ag4IWI340}wnd6;D&!$ScJh9;Y8#oLW?@pI@9=lANEb?~HN$h(W($-~7eCOp3=TOpt*KPxr4q&OzOI5RIXJ|!zA kFSQ)ZPRUBlOV5Xhm!~E{7|HoXsWGW3nI$osWjHLE0ND*8TmS$7 delta 113 zcmX>ka#e(PIWI340}wnd6;HF=$h(U@G+IBjIJKx)KfgG$Bso7<-z7h}G&eP`q*&iC xu_Q645+sqAsGE|Nn3tZfpO;z==0mw)c6n+NL{V~nQL27wN@j`vW=;-ECIGbVC@BB{ diff --git a/osinaweb/osinacore/edit/__pycache__/views.cpython-311.pyc b/osinaweb/osinacore/edit/__pycache__/views.cpython-311.pyc index 69861b1ea18d3428fc8eee349bb1cef8133bd967..2ed867bb079b7403bd3d8ec13f89bac15dcf7ce8 100644 GIT binary patch delta 97 zcmX?jjB(vDM!w~|yj%=Gpm9(lt=(lK-((IaPZz70@cg1|g@B^`tkmR^;+Xv6%)G?- ol&qM%)N(L8B`Yy6Js%=oo|*(N~GQ1$lJ~75$0kQ6P{m`tq@R@pOuHr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9ZL#*RlWrw@)Qk delta 119 zcmeB`T_DT5oR^o20SKO!il;5!$lJ{sov9yMoLW?@pI@9=lANEb?~at?F|z^y)vzQ~ delta 119 zcmbOyw^5FFIWI340}wnd6;G?$$a{=4dX|1@acWVqetvOgNpgO!zDs^`X>Mv>NwL0P zVo737B}gJKQ8y(kF)uw|KQFZ$%!hKp?DEtkh@#~DqE!9d%=DtflFa0IWI340}yB<>HO$Xm_q5$s|W6P{m`tq@R@pOuHr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9YxwuP_1thaM!& delta 119 zcmZ3&y`7tPIWI340}wnd6;HF=$Xm@Eou(gJoLW?@pI@9=lANEb?~W9rX)^)xN~GQ2$ji&(5$s|W6P{m`tq@R@pOuHr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9Zdux=a9p3?sAv delta 119 zcmeC@UBt_~oR^o20SKO!il-gf$ji$Tou(gJoLW?@pI@9=lANEb?~N~9gz$orAeBi+R+COp3=TOpt*KPxr4q&OzOI5RIXJ|!zA qFSQ)ZPRUBlOV5Xhm!~E{7|HoXsWG{k=|zbpnfZCeF`FZqOc(*+s3gGv delta 119 zcmeyx*2~VjoR^o20SKO!il=Sa$or8ox=KH^IJKx)KfgG$Bso7<-z7h}G&eP`q*&iC zu_Q645+sqAsGE|Nn3tZfpO;z==0mw)c6n+NL{V~nQL27!W_nR#NoIatvHoT^CKE;g D_Yy0Y diff --git a/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-311.pyc index e672c207643daaa205edc88a996d2368e34077d3..1a52fc1167bab5db5e24794b5e44ea6ecfe1c08a 100644 GIT binary patch delta 100 zcmey%_KJ;nIWI340}yB<|mLk@pd!N4kquOn81#wn9KrepYI7NpVbmab{j(d`ebK rUTQg*osyN9m!1z1FHcQ^Fp~3&Qe$#6(~A;IGV}9_V>Wv+88ZR^{B0!j delta 119 zcmaFG_Lq%!IWI340}wnd6;E5Xk@pc}bd`Q+acWVqetvOgNpgO!zDs^`X>Mv>NwL0P zVo737B}gJKQ8y(kF)uw|KQFZ$%!hKp?DEtkh@#~DqE!9d%=DtflFaHr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9a8sIT-<_jU-P1 delta 119 zcmcb>`k0k>IWI340}wnd6;Jco$Xmo1U8EmcoLW?@pI@9=lANEb?~}mYGZd Dj}|L8 diff --git a/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-311.pyc index 971c31da2dde29c68688fb0570897063d476a6eb..e8a491618ce19fccb1b80b0369c9f5b3cfab8ff4 100644 GIT binary patch delta 100 zcmZ3@HG_+HIWI340}yB<_EGkynPl=H-k4 DmVhfn diff --git a/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-311.pyc index d8ab8f2802428cbf970c3b36b09c9180373f8653..5089e74b57c0ad53d414282f25539b85dd0b5ef5 100644 GIT binary patch delta 100 zcmbQq-NwzkoR^o20SGh>N~Gy-QgZW8R=B4NB=cSf|`A{yHU7nf*QIwotl&YVbnO>Awl9``ZtiO2|^BG0} DR4FSD diff --git a/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-311.pyc index 86fccf1e1e3baaabdaa677e47671de5a204798ba..0b3213adc6bf3112ee9cda2f1b5672728c463737 100644 GIT binary patch delta 100 zcmcb|cAAZMIWI340}yB<`Pqk@q;GN2-feOn81#wn9KrepYI7NpVbmab{j(d`ebK rUTQg*osyN9m!1z1FHcQ^Fp~3&Qe$#6(~A;IGV}9_V>atE=`#WV(ljJq delta 119 zcmX@jc8`sBIWI340}wnd6;JEl$a|bIxN~A??ZW8R=B4NB=cSf|`A{yHU7nf*QIwotl&YVbnO>Awl9``ZtiO3X^9@D- DZ{{mo diff --git a/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-311.pyc index 9ce2d0b651abb7f3f4f83715c68173d2197ee810..3a683ccf327ea69c99ffd0b3d2710dc0d2e31619 100644 GIT binary patch delta 100 zcmbQr*2KoUoR^o20SGh>N~D!+ZW8R=B4NB=cSf|`A{yHU7nf*QIwotl&YVbnO>Awl9``ZtiSmlqY5Jc DgIy~J diff --git a/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-311.pyc index 9a5126a9a7ff08b57f8db2f4fe291959851fa093..2ac22d5ddca4d198f3c10ed92a2f74dc5e7cdb5e 100644 GIT binary patch delta 100 zcmbQh@t2)HT$g9ufQRiY66P{m`tq@R@pOuHr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9b9fDj5Nb-6S&r delta 119 zcmey%K7oUGIWI340}wnd6;E^6$g9s3JyAcjIJKx)KfgG$Bso7<-z7h}G&eP`q*&iC zu_Q645+sqAsGE|Nn3tZfpO;z==0mw)c6n+NL{V~nQL27!W_nR#NoIatvHs>3rbX25P9xO- delta 119 zcmbQvzKWf9IWI340}wnd6;HdpkynT*I#)lmIJKx)KfgG$Bso7<-z7h}G&eP`q*&iC zu_Q645+sqAsGE|Nn3tZfpO;z==0mw)c6n+NL{V~nQL27!W_nR#NoIatvHs?CCIdzQ Dj1MZS diff --git a/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-311.pyc index 7a6e328b6b9b78cea5091cd73bf1ddae0ce811a2..55bf6dfd924799218a622badd3c8bf416b2db50f 100644 GIT binary patch delta 100 zcmaFHewm$jIWI340}yB<?q&$jigzQQ=}06P{m`tq@R@pOuHr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9U_jMT`K0R3qg8 delta 119 zcmcc2{*0Y>IWI340}wnd6;G4e$jieN-K`&5oLW?@pI@9=lANEb?~N~As7$h)7#BiO|%COp3=TOpt*KPxr4q&OzOI5RIXJ|!zA qFSQ)ZPRUBlOV5Xhm!~E{7|HoXsWG{k=|zbpnfZCeF`Ly{qnQBGGbD`w delta 119 zcmaFQ*Tm1eoR^o20SKO!il-gh$h)5N~G=B$h(`(qs+xBCOp3=TOpt*KPxr4q&OzOI5RIXJ|!zA rFSQ)ZPRUBlOV5Xhm!~E{7|HoXsWG{k=|zbpnfZCeF`Jdy?=u4c)YT;w delta 119 zcmaDa+9bxioR^o20SKO!il>!rv diff --git a/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-311.pyc index f58bf990dbad81ed7ba77f572f2779b002dff69c..0ef74c51dfdd1980ca9c19d3663ba2bd52d78f3f 100644 GIT binary patch delta 100 zcmbQv-onnioR^o20SGh>N~E3J$oqrQBg@4qCOp3=TOpt*KPxr4q&OzOI5RIXJ|!zA qFSQ)ZPRUBlOV5Xhm!~E{7|HoXsWG{k=|zbpnfZCeF`E;Z%ozc_mLzfj delta 119 zcmZo+pU%#^oR^o20SKO!il^<_$oqpax>i55IJKx)KfgG$Bso7<-z7h}G&eP`q*&iC zu_Q645+sqAsGE|Nn3tZfpO;z==0mw)c6n+NL{V~nQL27!W_nR#NoIatvHoUXCUZsr D%x5b| diff --git a/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-311.pyc index 736f941ffe08d592afe27a2aea0b5624dae47d6c..781692250f1d26d32b8efae5aadd484e6d6863d9 100644 GIT binary patch delta 101 zcmeC?_`%M%oR^o20SGh>N~CczZRB%c@`!h_iV4pz%2o&{%FjwoE-8-5FV4(Mj8Dmm r$xAHJ+{ov^6kVhrTAW%`te;<;S(2QetM8JZT$-DjS5mC+ zmspaRQwfsDOVmxtO3X{o*Uw8W2lJs^FuOc838E-DzbI8dH#5B`u_QA;uULQcG^Qj* E0MT(Ppa1{> diff --git a/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-311.pyc index 925b598f9c55a6afd0ff635bda6325e8df6b9065..df59cc7acc9009aa468c7c27b6865bc1b5fd5214 100644 GIT binary patch delta 100 zcmaFJc8-mAIWI340}yB<^2#k@pg#N3@GoOn81#wn9KrepYI7NpVbmab{j(d`ebK rUTQg*osyN9m!1z1FHcQ^Fp~3&Qe$#6(~A;IGV}9_V>VkcsWSoq*r6nI delta 119 zcmX@d_K=NtIWI340}wnd6;GSCk@pf~be?`_acWVqetvOgNpgO!zDs^`X>Mv>NwL0P zVo737B}gJKQ8y(kF)uw|KQFZ$%!hKp?DEtkh@#~DqE!9d%=DtflFaxU~z diff --git a/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-311.pyc index 9f1f5fb617b0bcdb513f92434f20a96082b50193..537420620242ac62dfea083dfdf7c2508c3c6874 100644 GIT binary patch delta 100 zcmdnWvxtXxIWI340}yB<^2!k#{SzN2rTcOn81#wn9KrepYI7NpVbmab{j(d`ebK rUTQg*osyN9m!1z1FHcQ^Fp~3&Qe$#6(~A;IGV}9_V>ZjONH75atN~G0og0IwcZW8R=B4NB=cSf|`A{yHU7nf*QIwotl&YVbnO>Awl9``ZtiSmd(;`Ly DxOyw_ diff --git a/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-311.pyc index 02b320fe42b47ca18b9a56e1127c0c4faae045c9..8199a6fc00b95b7ce9a7647bb8938d57d3235166 100644 GIT binary patch delta 100 zcmdnRv7CcHr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9WC+$`}E3AtV?8 delta 119 zcmZ3^v5SLuIWI340}wnd6;G4e$Q#2HU7{aaoLW?@pI@9=lANEb?~Hr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9X+>1sMUd4B9 diff --git a/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-311.pyc index 6ada9f32fc9dbfb4252e7e83acdd00687595e898..50de412d4b277b97e6ce9700ace887b7224a931a 100644 GIT binary patch delta 100 zcmcc5c7~02IWI340}yB<`Pmk@pOvN3x4mOn81#wn9KrepYI7NpVbmab{j(d`ebK rUTQg*osyN9m!1z1FHcQ^Fp~3&Qe$#6(~A;IGV}9_V>X*GX)^)<)K4U3 delta 119 zcmX@ZcAt%RIWI340}wnd6;JEg$a{t{x=cT`IJKx)KfgG$Bso7<-z7h}G&eP`q*&iC zu_Q645+sqAsGE|Nn3tZfpO;z==0mw)c6n+NL{V~nQL27!W_nR#NoIatvHoU7CT&Il D=20s< diff --git a/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-311.pyc index 2375749d60d2add24154f7ceed7167cf4f78aef0..2235281474acfbbb5402815a9411e22050d50d7a 100644 GIT binary patch delta 100 zcmcb|ewv+kIWI340}yB<`1@$ZO2x5#(YO6P{m`tq@R@pOuHr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9Z}9oEZUjTqCvs delta 119 zcmX@jevh4ZIWI340}wnd6;ET`$ZO0LovI&NoLW?@pI@9=lANEb?~TNx88ZR^+b$%2 delta 119 zcmcb__LPlxIWI340}wnd6;GSEk@pm1bd`Q+acWVqetvOgNpgO!zDs^`X>Mv>NwL0P zVo737B}gJKQ8y(kF)uw|KQFZ$%!hKp?DEtkh@#~DqE!9d%=DtflFaHr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9a|a?=S)YnG_`p delta 119 zcmZ3_eTbWPIWI340}wnd6;BJ<$Xmx8ovt5RoLW?@pI@9=lANEb?~W9sKW790)*U4w delta 119 zcmeyzIgyKZIWI340}wnd6;Es1$a{z>dWwE%acWVqetvOgNpgO!zDs^`X>Mv>NwL0P zVo737B}gJKQ8y(kF)uw|KQFZ$%!hKp?DEtkh@#~DqE!9d%=DtflFa)6%0JGyH;{X5v delta 120 zcmdnSb&`v3IWI340}wnd6;FH3ypiueQ*^6-XmM&$v3`DWW=V2>uD(lta%paAUP-aO zUt&pOP9;bpFHtuoD={xUUq3Ik9L$Gu!R+$XB#5Hq{GwF-+|2Z%#FEVXykh;$q0A2% E0UpdOsQ>@~ diff --git a/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-311.pyc index 767b61fb88d9caf42c62fe755ed33b2ce50e3b95..41f66ae36666b75d9f6fe51149ceb1cab684dd25 100644 GIT binary patch delta 100 zcmZo=|HQ_-oR^o20SGh>N~9g$$orPjBiY3&COp3=TOpt*KPxr4q&OzOI5RIXJ|!zA qFSQ)ZPRUBlOV5Xhm!~E{7|HoXsWG{k=|zbpnfZCeF`Gk~3>X2{^CX@C delta 119 zcmeyw*2>PioR^o20SKO!il=Sd$orNtx=cT`IJKx)KfgG$Bso7<-z7h}G&eP`q*&iC zu_Q645+sqAsGE|Nn3tZfpO;z==0mw)c6n+NL{V~nQL27!W_nR#NoIatvHoT!CIdzQ D>s%{z diff --git a/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-311.pyc index 153aa3a855d80ebf051cd01c60cee258781b2716..6bfa577dd3338bc7e54da3d79a338640cbe1bbc8 100644 GIT binary patch delta 100 zcmcb}xsQ`~IWI340}yB<{a_k@pOfM}>=3On81#wn9KrepYI7NpVbmab{j(d`ebK rUTQg*osyN9m!1z1FHcQ^Fp~3&Qe$#6(~A;IGV}9_V>X*G&t(Jv<#r_y delta 119 zcmdnTd6AQMIWI340}wnd6;Io{k@pN!bhmzJacWVqetvOgNpgO!zDs^`X>Mv>NwL0P zVo737B}gJKQ8y(kF)uw|KQFZ$%!hKp?DEtkh@#~DqE!9d%=DtflFaN~Be7ZW8R=B4NB=cSf|`A{yHU7nf*QIwotl&YVbnO>Awl9``ZtiSmQqZlIq DwizpH diff --git a/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-311.pyc index b1e2f329b3c893d54943bab1ca3d332c91f6803b..74faa2f8736b233c5713a0c91e13fb4b3f4ab817 100644 GIT binary patch delta 100 zcmZ3?F@b}3IWI340}yB<>fX$m_@Ck>z3)6P{m`tq@R@pOuHr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9bXmav1?w?IX7U delta 119 zcmbQhv6zE*IWI340}wnd6;ET{$m_=xU8^5joLW?@pI@9=lANEb?~IWI340}yB<@$F$Q!}rQQ%?~6P{m`tq@R@pOuHr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9T>6niv6kUL-L9 delta 119 zcmZ3_afpL=IWI340}wnd6;Bh`$Q!{F-K-y4oLW?@pI@9=lANEb?~N~9gy$oq!TC&k4oCOp3=TOpt*KPxr4q&OzOI5RIXJ|!zA zFSQ)ZPRUBlOV5Xhm!~E{7|HoXsWG{k=|zbpnfZCeF$M-E29p&TMKPioR^o20SKO!il=SZ$oqydx?DfBIJKx)KfgG$Bso7<-z7h}G&eP`q*&iC zu_Q645+sqAsGE|Nn3tZfpO;z==0mw)c6n+NL{V~nQL27!W_nR#NoIatvHoU9CPPL5 D>hUXc diff --git a/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-311.pyc index e5b689ffc609fbcccb2e4c5bf9f79a41ccd157a0..43a3defccef6795a063f34a7b4d148cd7eb51c63 100644 GIT binary patch delta 100 zcmcc3eS({JIWI340}yB<|0o$lJ;65#?eP6P{m`tq@R@pOuHr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9U!VUoipzvG65l delta 119 zcmX@XeVdziIWI340}wnd6;BJ^$lJ*rovR;OoLW?@pI@9=lANEb?~GIWI340}yB<}B{$lJ%{QQ~416P{m`tq@R@pOuHr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9bjqzB2*<(wHUK delta 119 zcmcb``IeJ+IWI340}wnd6;Dgp$lJ#h-L4;6oLW?@pI@9=lANEb?~N~9TYZW8R=B4NB=cSf|`A{yHU7nf*QIwotl&YVbnO>Awl9``ZtiO2?lP@Cx DaFQyt diff --git a/osinaweb/osinacore/migrations/__pycache__/0044_remove_business_business_type.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0044_remove_business_business_type.cpython-311.pyc index 2706416d6e809bbc3db12681d21cc7e2efa509a8..05d9e117b2796b016393292d97e46bd04b89d069 100644 GIT binary patch delta 100 zcmey!dXJTNIWI340}yB<_!)$Xm?lk>g?&6P{m`tq@R@pOuHr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9a8t#TWs$3nYjD delta 119 zcmcb|`jM4)IWI340}wnd6;Jcs$Xm=9U9TTnoLW?@pI@9=lANEb?~N~DQwZW8R=B4NB=cSf|`A{yHU7nf*QIwotl&YVbnO>Awl9``ZtiO34QywD# DLslwl diff --git a/osinaweb/osinacore/migrations/__pycache__/0046_task_requirement.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0046_task_requirement.cpython-311.pyc index 7932d60bdc891d229f9b73b197f61276738927f6..a4d0a73e0a016bdd981969e5b52a6eb395c1ca5f 100644 GIT binary patch delta 101 zcmbQu(ZRvDoR^o20SGh>N~G~JZRB%g@`!h_iV4pz%2o&{%FjwoE-8-5FV4(Mj8Dmm r$xAHLrZ7eT Dk{T+@ diff --git a/osinaweb/osinacore/migrations/__pycache__/0048_alter_customerprofile_business.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0048_alter_customerprofile_business.cpython-311.pyc index 5caeabf1a3bfb6cce2ca431c610f681c2ea4f557..bf9cbf184aae8e69d7e9450c7bdbaa061dd10406 100644 GIT binary patch delta 100 zcmcb{ahQX5IWI340}yB<?q$$eY3Bk?Ud=6P{m`tq@R@pOuHr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9UcM+86Hr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9aMHsu=-n-Xs73 delta 127 zcmZ3?v5kXwIWI340}wnd6;I>d$Q#TQ-=H5_oLW?@pI@9=lANEb?~Hr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9ViJpBVv?<|LQ^ delta 119 zcmcb^^`47&IWI340}wnd6;Bi0$ScAeJyk!nIJKx)KfgG$Bso7<-z7h}G&eP`q*&iC zu_Q645+sqAsGE|Nn3tZfpO;z==0mw)c6n+NL{V~nQL27!W_nR#NoIatvHs>v=Ff}( Dkv=PC diff --git a/osinaweb/osinacore/migrations/__pycache__/0051_alter_task_requirement.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0051_alter_task_requirement.cpython-311.pyc index 292f0292f19fc0c1c01957c1782007805b6fde18..010920d41ec0177f1c49e5f63e1f92385ee1b465 100644 GIT binary patch delta 100 zcmdnYv4DejIWI340}yB<|Os$eYCEk?LX<6P{m`tq@R@pOuHr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9Zk{G8qAI&?E`~ delta 119 zcmZ3$v6+K+IWI340}wnd6;Bi2$eY9zU7;UZoLW?@pI@9=lANEb?~N~EzfZRE3N@`!e^iV4pz%2o&{%FjwoE-8-5FV4(Mj8Dmm r$xAHH+{kCm6rHCZTAW%`te;<;S(2QetM8JZT$-DjS5mC+ zmspaRQwfsDOVmxtO3X{o*Uw8W2lJs^FuOc838E-DzbI8dH#5B`u_QA;uULQcM5Y8r E0LGdtfB*mh diff --git a/osinaweb/osinacore/migrations/__pycache__/0053_pointactivity.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0053_pointactivity.cpython-311.pyc index 936471732e6dd863dcd33d1a6533ed09c4c5bce0..3c4e0d167c54f2973b043be27ae822bf0ccc9ba3 100644 GIT binary patch delta 100 zcmbQo)y>7boR^o20SGh>N~FEp$jip;5#wSN6P{m`tq@R@pOuHr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9X_28yEqBp(HQ> delta 119 zcmeC?n#aYvoR^o20SKO!il<%Q$jinYov$BSoLW?@pI@9=lANEb?~*rYc4N Dv41Ny diff --git a/osinaweb/osinacore/migrations/__pycache__/0055_alter_point_status.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0055_alter_point_status.cpython-311.pyc index 2c1aaaddf411d26a1301fd52fa5843ff770f4a2c..d22abd1e508cef72f4325413730bf1748564a33b 100644 GIT binary patch delta 100 zcmey&{(zl#IWI340}yB<?q&$ZN&qk?3L-6P{m`tq@R@pOuHr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9Ylr0vQ37O(Y`# delta 119 zcmaFB{+XS3IWI340}wnd6;G4j$ZN$EU7{aaoLW?@pI@9=lANEb?~k@q5_N4ASqOn81#wn9KrepYI7NpVbmab{j(d`ebK rUTQg*osyN9m!1z1FHcQ^Fp~3&Qe$#6(~A;IGV}9_V>VkdnKA+Z=s+Z_ delta 119 zcmcc3_KuBrIWI340}wnd6;GSFk@q5Fbe(=^acWVqetvOgNpgO!zDs^`X>Mv>NwL0P zVo737B}gJKQ8y(kF)uw|KQFZ$%!hKp?DEtkh@#~DqE!9d%=DtflFaN~C?-$lJu^(e7du6P{m`tq@R@pOuHr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9Z-4HZuYMwzefy delta 119 zcmeC;oXg3(oR^o20SKO!il<%M$lJseJxf2dIJKx)KfgG$Bso7<-z7h}G&eP`q*&iC zu_Q645+sqAsGE|Nn3tZfpO;z==0mw)c6n+NL{V~nQL27!W_nR#NoIatvHs@kOq&@2 DzTYe$ diff --git a/osinaweb/osinacore/migrations/__pycache__/0058_remove_point_total_time_hours_and_more.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0058_remove_point_total_time_hours_and_more.cpython-311.pyc index ca982df828eaef29e0fc54cb6fffc5a1dd5d3f58..4412c12bc0518564b4b022705cb793c9e7f49038 100644 GIT binary patch delta 115 zcmcb}zK@-EIWI340}yB<?Sv$ji+XTHr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CK7y|=Si}<3{-2AfC$@+{Eo2M~Z GGXen1_9%w{ delta 119 zcmdnTevzGbIWI340}wnd6;F%Z$ji+X-Ju^^oLW?@pI@9=lANEb?~Hr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9awSDi{HG%_JrO delta 119 zcmZ3@v5$jyIWI340}wnd6;Bh}$Q#ELU7;UZoLW?@pI@9=lANEb?~a6|88QL@>7XRA delta 119 zcmcc3_KuBrIWI340}wnd6;GSHk@qTNbd`Q+acWVqetvOgNpgO!zDs^`X>Mv>NwL0P zVo737B}gJKQ8y(kF)uw|KQFZ$%!hKp?DEtkh@#~DqE!9d%=DtflFaHr(`AOrRPJ$%TtpejO6^H)R^4N^rFO)%>2CKn9b!(MT`K4nTPGd}jmzuVp05 delta 119 zcmbQjvz&)_IWI340}wnd6;GSEk@p01bdG*#acWVqetvOgNpgO!zDs^`X>Mv>NwL0P zVo737B}gJKQ8y(kF)uw|KQFZ$%!hKp?DEtkh@#~DqE!9d%=DtflFaT-?=`aESyX+(n delta 119 zcmdnRc9xBIIWI340}wnd6;G?%$h(sN~BHM$h(QzBizL*COp3=TOpt*KPxr4q&OzOI5RIXJ|!zA rFSQ)ZPRUBlOV5Xhm!~E{7|HoXsWG{k=|zbpnfZCeF`K1Welr39l8q#1 delta 119 zcmZqTnaabvoR^o20SKO!ilSU&srxGNQm#CYPm6(^Fub-D%4(3C-V0L+G5=2pQeo?A^Zf1H>Vo7FxUa|h>3Z@uF E0Oe3CrvLx| diff --git a/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-311.pyc index b6115eb3cd55e76ead53acef061a06819c1701ae..ec4e2e020d58f3d1d2470e76494d0f6c34c91288 100644 GIT binary patch delta 95 zcmcb_xSx@GIWI340}yB&l$gkE>Jj8(6%(Fcl&ug@l%JKFTv8m9U!0kj7@v|Alb2c! lW~XE&=B4LD#LH8YAdKYvqSTn&%=DtflFam*XBEA3s delta 114 zcmdnbc!`mFIWI340}wnd6`#m$8l9>iTAW%`te;<;S(2QetM8JZT$-DjS5mC+mspaR yQwfsDOVmxtO3X{o*Uw8W2lJs^FuOc838E-DzbI8dH#5B`u_QA;uULO#hdBVo`6;FV diff --git a/osinaweb/osinacore/templates/add-edit-main.html b/osinaweb/osinacore/templates/add-edit-main.html index f21b2bcd..2433a634 100644 --- a/osinaweb/osinacore/templates/add-edit-main.html +++ b/osinaweb/osinacore/templates/add-edit-main.html @@ -161,8 +161,9 @@ {% if user.is_superuser %} -
-
+
+

Billing

@@ -173,9 +174,40 @@ style="font-size: 18px; color: white; display: none;">
+ +
{% endif %} +
+ {% if user.is_superuser %} -
-
+
+

Billing

@@ -411,10 +445,40 @@ style="font-size: 18px; color: white; display: none;">
-
+ +
{% endif %} +
-
+
diff --git a/osinaweb/osinacore/templates/main.html b/osinaweb/osinacore/templates/main.html index 6a78928f..32b210cd 100644 --- a/osinaweb/osinacore/templates/main.html +++ b/osinaweb/osinacore/templates/main.html @@ -189,8 +189,8 @@ {% if user.is_superuser %} -
-
+
+

Billing

@@ -201,6 +201,36 @@ style="font-size: 18px; color: white; display: none;">
+ +
{% endif %} @@ -427,22 +457,53 @@
- {% if user.is_superuser %} -
-
-
- -

Billing

-
-
- - -
-
-
- - {% endif %} + + {% if user.is_superuser %} +
+
+
+ +

Billing

+
+
+ + +
+
+ + +
+ {% endif %}
diff --git a/osinaweb/osinaweb/__pycache__/__init__.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/__init__.cpython-311.pyc index 78855eab81d355e93a4b2d83b6e514e8b958e0f9..2e940e9206dd0e0143e2e00a859f413d8febd463 100644 GIT binary patch delta 83 zcmX@cxS5fAIWI340}yB&l$gkEYUAc&6%(Fcl&ug@l%JKFTv8m9U!0kj7@v|Alb2c! VW~XE&=B4LD#LH8Y5R8fa<^WKL9ew}+ delta 102 zcmdnYc#M&IIWI340}wnd6`#m$>K~~eTAW%`te;<;S(2QetM8JZT$-DjS5mC+mspaR kQwfsDOVmxtO3X{o*Uw8W2lJs^FuOc838DzZm{?;D0NigRlK=n! diff --git a/osinaweb/osinaweb/__pycache__/settings.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/settings.cpython-311.pyc index eec184b20e67ebe55301ff3eefe054aff035f67f..ce85a13dd29c358bb131dfef2184d25d17ed1771 100644 GIT binary patch delta 88 zcmbOy)h)%loR^o20SGh?N~EpY$a|H`#?8elCOp3=TOpt*KPxr4q&OzOI5RIXJ|!zA bFSQ)ZPRUBlOV5Xhm!~En7@G~b-!cLK53?V| delta 107 zcmeB{nkU7(oR^o20SKO!il>QgvGhCOp3=TOpt*KPxr4q&OzOI5RIXJ|!zA aFSQ)ZPRUBlOV5Xhm!~En7@M_N1sMVL?H+yr delta 107 zcmZ3%vzv!^IWI340}wnd6;D&z$a{{(KU6=oIJKx)KfgG$Bso7<-z7h}G&eP`q*&iC pu_Q645+sqAsGE|Nn3tZfpO;z==0mw)c6n+NL=lLwS)5gn5dfhkC3OG* diff --git a/osinaweb/osinaweb/__pycache__/wsgi.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/wsgi.cpython-311.pyc index 0e86673c8c6dfd0bcb91267829ec273bd735ee21..9f59eb77772a2ff2f914775f67a5a31d665f01b2 100644 GIT binary patch delta 87 zcmcb_x}TMIIWI340}yB)lt`Pok@pv)jgyO2On81#wn9KrepYI7NpVbmab{j(d`ebK aUTQg*osyN9m!1z1FHcQEFeZmF)c^nn4Hs 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 { + return response.json(); + }) + .then(data => { + var itemsSelectTag = document.getElementById('itemsSelectTag'); + itemsSelectTag.innerHTML = ''; + + console.log('Items related to customer:', data.items_related_to_customer); + data.items_related_to_customer.forEach(function (item) { + console.log('Item:', item); + var option = document.createElement('option'); + option.value = item.id; + option.text = item.title; + itemsSelectTag.appendChild(option); + }); + + console.log('Items without customer:', data.items_without_customer); + data.items_without_customer.forEach(function (item) { + console.log('Item:', item); + var option = document.createElement('option'); + option.value = item.id; + option.text = item.title; + itemsSelectTag.appendChild(option); + }); + + + // To make the select tag searchable + $(document).ready(function () { + $('#itemsSelectTag').selectize(); + }); + }) + .catch(error => console.error('Error fetching customer items:', error)); + }); +}); + diff --git a/osinaweb/static/js/billing/items.js b/osinaweb/static/js/billing/items.js new file mode 100644 index 00000000..78bf8c08 --- /dev/null +++ b/osinaweb/static/js/billing/items.js @@ -0,0 +1,30 @@ +const products = document.getElementById('products'); +const services = document.getElementById('services'); + +const productsContainer = document.getElementById('productsContainer'); +const servicesContainer = document.getElementById('servicesContainer'); + +const addProductButton = document.getElementById('addProductButton'); +const addServiceButton = document.getElementById('addServiceButton'); + +products.addEventListener('click', () => { + productsContainer.classList.remove('hidden'); + servicesContainer.classList.add('hidden'); + + products.classList.add('selectedItemType'); + services.classList.remove('selectedItemType'); + + addProductButton.classList.remove('hidden'); + addServiceButton.classList.add('hidden'); +}); + +services.addEventListener('click', () => { + productsContainer.classList.add('hidden'); + servicesContainer.classList.remove('hidden'); + + products.classList.remove('selectedItemType'); + services.classList.add('selectedItemType'); + + addProductButton.classList.add('hidden'); + addServiceButton.classList.remove('hidden'); +}); \ No newline at end of file diff --git a/osinaweb/static/js/customer_dashboard/products.js b/osinaweb/static/js/customer_dashboard/products.js new file mode 100644 index 00000000..0e8aaf3a --- /dev/null +++ b/osinaweb/static/js/customer_dashboard/products.js @@ -0,0 +1,19 @@ +const solutionsBtn = document.getElementById('solutions'); +const hostingBtn = document.getElementById('hostingSolutions'); + +const solutionsContainer = document.getElementById('solutionsContainer'); +const hostingContainer = document.getElementById('hostingSolutionsContainer'); + +solutionsBtn.addEventListener('click', () => { + solutionsContainer.classList.remove('hidden'); + hostingContainer.classList.add('hidden'); + hostingBtn.classList.remove('selectedProductCategory'); + solutions.classList.add('selectedProductCategory'); +}); + +hostingBtn.addEventListener('click', () => { + solutionsContainer.classList.add('hidden'); + hostingContainer.classList.remove('hidden'); + solutions.classList.remove('selectedProductCategory'); + hostingBtn.classList.add('selectedProductCategory'); +}); \ No newline at end of file diff --git a/osinaweb/static/js/get-updated-user-activity.js b/osinaweb/static/js/get-updated-user-activity.js index 8f312e53..e6e6324d 100644 --- a/osinaweb/static/js/get-updated-user-activity.js +++ b/osinaweb/static/js/get-updated-user-activity.js @@ -1,13 +1,13 @@ -function refreshUserActivityContainer() { +// function refreshUserActivityContainer() { - $.ajax({ - url: '/getupdatedactivities/', - method: 'GET', - dataType: 'html', - success: function(data) { - $('#activitiesContainer').html(data); - } - }); -} +// $.ajax({ +// url: '/getupdatedactivities/', +// method: 'GET', +// dataType: 'html', +// success: function(data) { +// $('#activitiesContainer').html(data); +// } +// }); +// } -setInterval(refreshUserActivityContainer, 60000); \ No newline at end of file +// setInterval(refreshUserActivityContainer, 60000); \ No newline at end of file diff --git a/osinaweb/tailwind.config.js b/osinaweb/tailwind.config.js index 81d273d9..02325896 100644 --- a/osinaweb/tailwind.config.js +++ b/osinaweb/tailwind.config.js @@ -5,6 +5,7 @@ module.exports = { "./static/dist/output.css", "./osinacore/templates/**/*.html", "./customercore/templates/**/*.html", + "./billing/templates/**/*.html", ], theme: { screens: {