diff --git a/osinaweb/billing/__pycache__/urls.cpython-310.pyc b/osinaweb/billing/__pycache__/urls.cpython-310.pyc index 5855b97f..cc874a20 100644 Binary files a/osinaweb/billing/__pycache__/urls.cpython-310.pyc and b/osinaweb/billing/__pycache__/urls.cpython-310.pyc differ diff --git a/osinaweb/billing/__pycache__/views.cpython-310.pyc b/osinaweb/billing/__pycache__/views.cpython-310.pyc index 66fe0c6e..40bbec28 100644 Binary files a/osinaweb/billing/__pycache__/views.cpython-310.pyc and b/osinaweb/billing/__pycache__/views.cpython-310.pyc differ diff --git a/osinaweb/billing/add/__pycache__/views.cpython-310.pyc b/osinaweb/billing/add/__pycache__/views.cpython-310.pyc index 1900e620..24d318f7 100644 Binary files a/osinaweb/billing/add/__pycache__/views.cpython-310.pyc and b/osinaweb/billing/add/__pycache__/views.cpython-310.pyc differ diff --git a/osinaweb/billing/templates/details_templates/invoice-details.html b/osinaweb/billing/templates/details_templates/invoice-details.html index cd9c52f3..dd340538 100644 --- a/osinaweb/billing/templates/details_templates/invoice-details.html +++ b/osinaweb/billing/templates/details_templates/invoice-details.html @@ -6,22 +6,173 @@ - Invoice Details + + - -
- + +
+
+ +
+ + +
+

Invoice $024-1298

+
+ + +
+
+

Bill To:

+ +

{{order.customer}}

+

Lb

+

+96103556600

+

info@winabig.com

-
-

Bill To: {{order.customer}}

-

Customer Details: 036466464

+
+ +
+

Due Date: 2024-03-03

+ +

OSITCOM ltd

+

CR. 2014057

+

Registration Number: 1808707

+

Jounieh, Lebanon

+

Facing Fouad Chehab Stadium,

+

Jounieh Highway,

+

7th Floor, Doueihy Building

+

PO Box: 90-1246

+

Tel/Fax: +961 (9) 918718/9

+

Mobile: +961 (70) 918 718

+

billing@ositcom.net

+
+
+ + +
+

Invoice Items

-
+
+
    +
  • USSD App integration via API
    • +
  • Promotion 1 for users when registering during a specific period of time
    • +
  • Promotion 2 for campaign tickets during a specific period of time
    • +
+ +
+

Total Cost: $1200.00

+
+
+ +
diff --git a/osinaweb/billing/templates/listing_pages/invoices.html b/osinaweb/billing/templates/listing_pages/invoices.html index 8c2a6720..768ee50d 100644 --- a/osinaweb/billing/templates/listing_pages/invoices.html +++ b/osinaweb/billing/templates/listing_pages/invoices.html @@ -79,7 +79,7 @@
- + diff --git a/osinaweb/billing/urls.py b/osinaweb/billing/urls.py index 67d72391..8baa9ab9 100644 --- a/osinaweb/billing/urls.py +++ b/osinaweb/billing/urls.py @@ -12,7 +12,7 @@ urlpatterns = [ path('invoices', views.invoices, name='invoices'), # DETAILS - path('invoice-details//', views.invoice_details, name='invoicedetails'), + path('invoice-details/', views.invoice_details, name='invoicedetails'), path('fetch-customer-items//', views.fetch_customer_items, name='fetch_customer_items'), diff --git a/osinaweb/billing/views.py b/osinaweb/billing/views.py index 7c9bfb66..189058f2 100644 --- a/osinaweb/billing/views.py +++ b/osinaweb/billing/views.py @@ -45,7 +45,7 @@ def invoice_details(request, order_id): 'order' : order, } - return render(request, 'invoice-details.html', context) + return render(request, 'details_templates/invoice-details.html', context) diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index bb629cd7..32a58cd0 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc index 095c9eb5..48a96a42 100644 Binary files a/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc differ diff --git a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc index d5ac0563..54836494 100644 Binary files a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc differ diff --git a/osinaweb/osinacore/templates/login.html b/osinaweb/osinacore/templates/login.html index cdbf17e9..7871940f 100644 --- a/osinaweb/osinacore/templates/login.html +++ b/osinaweb/osinacore/templates/login.html @@ -19,9 +19,7 @@ diff --git a/osinaweb/osinacore/urls.py b/osinaweb/osinacore/urls.py index d2914ff5..8789e28a 100644 --- a/osinaweb/osinacore/urls.py +++ b/osinaweb/osinacore/urls.py @@ -25,6 +25,7 @@ urlpatterns = [ path('login', views.signin, name='signin'), path('go_online/', views.go_online, name='go_online'), path('logout/', views.signout, name='signout'), + path('check-email-availability/', views.check_email_availability, name='check-email-availability'), path('', views.home, name='home'), path('statusmobilemodal/', views.status_mobile_modal, name='statusmobilemodal'), path('userrecentativities/', views.user_recent_activities_modal, name='userrecentativities'), diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py index 1c6489f0..1120223d 100644 --- a/osinaweb/osinacore/views.py +++ b/osinaweb/osinacore/views.py @@ -69,6 +69,15 @@ def go_online(request): return HttpResponse('') +def check_email_availability(request): + if request.method == "GET": + email = request.GET.get("email") + + if User.objects.filter(email=email).exists(): + response_data = {"exists": True} + else: + response_data = {"exists": False} + return JsonResponse(response_data) @login_required diff --git a/osinaweb/static/css/invoice.css b/osinaweb/static/css/invoice.css new file mode 100644 index 00000000..9186a15e --- /dev/null +++ b/osinaweb/static/css/invoice.css @@ -0,0 +1,83 @@ +.mainContainer { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + gap: 20px; +} + +.mainContainer img { + width: 150px; +} + +.invoiceDetails { + width: 100%; + display: grid; + grid-template-columns: 1fr 1fr; + gap: 20px; +} + +.customerDetails { + display: flex; + flex-direction: column; + gap: 5px; +} + +.customerDetails h1 { + color: rgb(181, 181, 181); + font-size: 18px; +} + +.customerDetails p { + color: #374a7a; +} + +.companyDetails { + display: flex; + align-items: end; + flex-direction: column; + gap: 5px; + color: #374a7a; +} + + +.invoiceItemsBar { + width: 100%; + height: 50px; + background-color: #374a7a; + padding: 10px 20px; + margin: 20px 0px; + display: flex; + justify-content: space-between; + align-items: center; + gap: 10px; + color: white; + font-weight: 600; +} + +.invoiceItemsContainer { + width: 100%; + padding: 0px 20px; +} + +.invoiceItemsContainer ul { + color: #374a7a; + list-style: circle; +} + +.totalContainer { + width: 100%; + display: flex; + justify-content: end; + margin-top: 20px; + font-size: 20px; +} + +.totalContainer p { + color: rgb(181, 181, 181); +} + +.totalContainer p span { + font-weight: 600; + color: #374a7a; +} \ No newline at end of file diff --git a/osinaweb/static/images/invoice_10.pdf b/osinaweb/static/images/invoice_10.pdf new file mode 100644 index 00000000..da80d85c Binary files /dev/null and b/osinaweb/static/images/invoice_10.pdf differ diff --git a/osinaweb/static/images/invoice_11.pdf b/osinaweb/static/images/invoice_11.pdf new file mode 100644 index 00000000..95ff7704 Binary files /dev/null and b/osinaweb/static/images/invoice_11.pdf differ diff --git a/osinaweb/static/images/invoice_12.pdf b/osinaweb/static/images/invoice_12.pdf new file mode 100644 index 00000000..4187eb05 Binary files /dev/null and b/osinaweb/static/images/invoice_12.pdf differ diff --git a/osinaweb/static/images/invoice_13.pdf b/osinaweb/static/images/invoice_13.pdf new file mode 100644 index 00000000..9abe1fcf Binary files /dev/null and b/osinaweb/static/images/invoice_13.pdf differ diff --git a/osinaweb/static/images/invoice_14.pdf b/osinaweb/static/images/invoice_14.pdf new file mode 100644 index 00000000..a35d59b4 Binary files /dev/null and b/osinaweb/static/images/invoice_14.pdf differ diff --git a/osinaweb/static/images/invoice_15.pdf b/osinaweb/static/images/invoice_15.pdf new file mode 100644 index 00000000..54b5e436 Binary files /dev/null and b/osinaweb/static/images/invoice_15.pdf differ diff --git a/osinaweb/static/images/invoice_16.pdf b/osinaweb/static/images/invoice_16.pdf new file mode 100644 index 00000000..3c8e9a18 Binary files /dev/null and b/osinaweb/static/images/invoice_16.pdf differ diff --git a/osinaweb/static/images/invoice_17.pdf b/osinaweb/static/images/invoice_17.pdf new file mode 100644 index 00000000..a1eb3828 Binary files /dev/null and b/osinaweb/static/images/invoice_17.pdf differ diff --git a/osinaweb/static/images/invoice_18.pdf b/osinaweb/static/images/invoice_18.pdf new file mode 100644 index 00000000..4e52231e Binary files /dev/null and b/osinaweb/static/images/invoice_18.pdf differ diff --git a/osinaweb/static/images/invoice_19.pdf b/osinaweb/static/images/invoice_19.pdf new file mode 100644 index 00000000..39420d3e Binary files /dev/null and b/osinaweb/static/images/invoice_19.pdf differ diff --git a/osinaweb/static/images/invoice_20.pdf b/osinaweb/static/images/invoice_20.pdf new file mode 100644 index 00000000..6404b5cc Binary files /dev/null and b/osinaweb/static/images/invoice_20.pdf differ diff --git a/osinaweb/static/images/invoice_21.pdf b/osinaweb/static/images/invoice_21.pdf new file mode 100644 index 00000000..7e6ceec2 Binary files /dev/null and b/osinaweb/static/images/invoice_21.pdf differ diff --git a/osinaweb/static/images/invoice_22.pdf b/osinaweb/static/images/invoice_22.pdf new file mode 100644 index 00000000..682824fa Binary files /dev/null and b/osinaweb/static/images/invoice_22.pdf differ diff --git a/osinaweb/static/images/invoice_23.pdf b/osinaweb/static/images/invoice_23.pdf new file mode 100644 index 00000000..554a4302 Binary files /dev/null and b/osinaweb/static/images/invoice_23.pdf differ diff --git a/osinaweb/static/images/invoice_24.pdf b/osinaweb/static/images/invoice_24.pdf new file mode 100644 index 00000000..5a706bb9 Binary files /dev/null and b/osinaweb/static/images/invoice_24.pdf differ diff --git a/osinaweb/static/images/invoice_4.pdf b/osinaweb/static/images/invoice_4.pdf new file mode 100644 index 00000000..b247ba14 Binary files /dev/null and b/osinaweb/static/images/invoice_4.pdf differ diff --git a/osinaweb/static/images/invoice_5.pdf b/osinaweb/static/images/invoice_5.pdf new file mode 100644 index 00000000..6b1aafa4 Binary files /dev/null and b/osinaweb/static/images/invoice_5.pdf differ diff --git a/osinaweb/static/images/invoice_6.pdf b/osinaweb/static/images/invoice_6.pdf new file mode 100644 index 00000000..57dbc2e8 Binary files /dev/null and b/osinaweb/static/images/invoice_6.pdf differ diff --git a/osinaweb/static/images/invoice_7.pdf b/osinaweb/static/images/invoice_7.pdf new file mode 100644 index 00000000..f9c03b74 Binary files /dev/null and b/osinaweb/static/images/invoice_7.pdf differ diff --git a/osinaweb/static/images/invoice_8.pdf b/osinaweb/static/images/invoice_8.pdf new file mode 100644 index 00000000..6e9eced9 Binary files /dev/null and b/osinaweb/static/images/invoice_8.pdf differ diff --git a/osinaweb/static/images/invoice_9.pdf b/osinaweb/static/images/invoice_9.pdf new file mode 100644 index 00000000..dd08e7eb Binary files /dev/null and b/osinaweb/static/images/invoice_9.pdf differ diff --git a/osinaweb/static/images/ositcom_logos/full-logo.png b/osinaweb/static/images/ositcom_logos/full-logo.png index e765d529..5603c7c3 100644 Binary files a/osinaweb/static/images/ositcom_logos/full-logo.png and b/osinaweb/static/images/ositcom_logos/full-logo.png differ diff --git a/osinaweb/static/js/get-updated-user-activity.js b/osinaweb/static/js/get-updated-user-activity.js index e6e6324d..8f312e53 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