From 56067eb741d718fe90a18d9cc72b7d794a694c5d Mon Sep 17 00:00:00 2001
From: nataly <nataly.abi.wajeh0@gmail.com>
Date: Mon, 13 May 2024 12:41:09 +0300
Subject: [PATCH] new changes.

---
 .../add/__pycache__/urls.cpython-312.pyc      | Bin 1070 -> 1070 bytes
 .../add/__pycache__/views.cpython-312.pyc     | Bin 12211 -> 12211 bytes
 osinaweb/db.sqlite3                           | Bin 1245184 -> 1245184 bytes
 .../templates/recent-activities-page.html     | 257 ++++++++++++++----
 4 files changed, 208 insertions(+), 49 deletions(-)

diff --git a/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc b/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc
index 5e0ec8be00b3e8719c6c2e9bef640ad13447e69a..06afd0475f57c3ea119f47cfa02e4ba73cd6d3d9 100644
GIT binary patch
delta 19
ZcmZ3-v5tf5G%qg~0}$N5yOB$U1pqU*1qA>A

delta 19
ZcmZ3-v5tf5G%qg~0}yP#zL86X1pqRs1lIrn

diff --git a/osinaweb/billing/add/__pycache__/views.cpython-312.pyc b/osinaweb/billing/add/__pycache__/views.cpython-312.pyc
index 537ea7da22b814928751d08189d30abea1757ccd..d7ea02c4627dd29f6191f2086ffc8bb636dd546c 100644
GIT binary patch
delta 19
ZcmdlSzd4@kG%qg~0}v=a*vPd~9{@bb1+oAD

delta 19
ZcmdlSzd4@kG%qg~0}x!ivyp41J^(<~23`OF

diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index effcde394597876b1b0c50d5dbd7df9212e13f5d..15db6d8381feb433e4e51aa790da00096942aa9b 100644
GIT binary patch
delta 679
zcmZo@@M&o9nIO%0aH5Pe<H3yybF>*1H~-ZZaOShLGB&g_HP<t<FtIc>n=GBbjmOx+
z%GgBD%+$=x+@$$#e*4{gMj&PaVrC#_0b*7lW&>h&Am#vKP9Wymem9>x|1&pKx0!*l
zMSFNM&-U<S-nBK%W*my!*&p!wGcs`~P7iy?dyR=heY?&h-jA%jtjwHDOp0vGj7(Nc
z3fuKw@LpTa9L)S;I{O4Z=jlEZ_)?fyqBbjD5@J?SW%gyVEX~TvG$<@FEUhxnEXXJ;
zOES&LGBqtIPBOAg%gfH+{%kUz91n94^V{j{3;6PxfOOdcJ`<n;j?7vh14{CYvy&?g
zN~)^L(ku+KD^txXs*;Thi&LvoOiT>Z3mA@qR88OWS4g4Vd<h>A^8>NKcJn2IY`oe{
zs*O!bjjpV|&B2ZYOqzUgs_69Eje-k2f-Tam!YU)Pb93Xp%UsKf9Fq$i-GZtrDpGyj
z%bd!yvb|k&ot;t)-TfjXJPebK42(>44NP^7%oPlP(F2JMP<U=n-6Xi3vz~yx1*ygc
zR))o9AX`l{BjYPvy!<U9GrU~lT|Lbzi&8BE^Fl10je;uUi!04S4O7i5Om%}21F_m_
zVq#%#0Q9g6*u$3P7DlDH+h^|)%sk92#?v~Ty+KHmg=Z~K>vll_#y}os)fUC+jJ-nQ
rf^cV>S{RuaskJCf-`FoCDq;-w5H!7+nVMRvw#b7uZ2!<BBv1?hJjL1_

delta 611
zcmZo@@M&o9nIO%$eWHvr<MxdSbF>-dH~-ZZaON|$GO@5SHq<k<G&VOim@J*YjmOZ^
z%EVaD*wDhn)U^3-e*4{gMj&PaVrC#_0b*7lW&>h&Am#vKP9Wymem9>x|1&pKw~?8d
zVS9Ko&-U<S-nBK%CLDU(*&p!wGft0q$a`(O!6V*}tdj#01h?zG;Jvn-IfVJpboL2+
z&P+hsYXV=&X2nZF%qptPzD#DNCV6?5g%*VtRT&lOsg=n_CRvs_*(JpW1!Z~V78cu|
zP3Dv1VGd*wp3c62FMoQ)0zMNa7E7Q3j?7vh19D6%EK`!Ra?H~53epQp3rbUrOv^1Q
z4a`c53yZVLa~Y0+R88OWS4g4Vd<h>A^8>NKcJn2IY`i)K1`JI~jjpV|&B2a@oHBhQ
z3#-WV+Kqw>Jc0^?tl~35Gt={Zas!=G!o$N;s`9JMD@~pJ3L>+TJ>ruy19Y>Ull*hS
zT>LVMjSP%TbPY^(jm#AcEUl12aC_<|!R?&&gltYVHn1`*HUrrjYLS%dUR7z7QDRw@
z?BiYK;!%<m>|vfB>{6Cq;FfF|lx|v>lI&OEUK)tiRznjLb7P>FUBF(pEVnQ!&D}nG
nk6`9uW)Yri)7cw@G`9;1FfQX^R&9}=&e$s?zWqawkU%j2<H*f9

diff --git a/osinaweb/osinacore/templates/recent-activities-page.html b/osinaweb/osinacore/templates/recent-activities-page.html
index 2cdc4d62..ae2146b5 100644
--- a/osinaweb/osinacore/templates/recent-activities-page.html
+++ b/osinaweb/osinacore/templates/recent-activities-page.html
@@ -39,7 +39,7 @@
             <div>
                 <a href="{% url 'home' %}">
                     <div class="mb-10 w-full flex justify-center">
-                        <img src="{% static 'images/osinaw.png' %}" class="w-[180px]">
+                        <img src="{% static 'images/ositcom_logos/osinawhite.png' %}" class="w-[180px]">
                     </div>
                 </a>
 
@@ -48,7 +48,9 @@
                         class="w-full bg-transparent border border-white border-opacity-10 py-2 px-3 text-white outline-none rounded-md"
                         placeholder="Search...">
                     <div class="inset-y-0 absolute right-5 flex justify-center items-center text-white">
-                        <i class="fa fa-search"></i>
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"  class="w-[20px] text-white">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607Z" />
+                        </svg>
                     </div>
                 </div>
 
@@ -62,7 +64,9 @@
                         <div
                             class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <img src="{% static 'images/icons/users.png' %}" class="w-[30px]">
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M18 18.72a9.094 9.094 0 0 0 3.741-.479 3 3 0 0 0-4.682-2.72m.94 3.198.001.031c0 .225-.012.447-.037.666A11.944 11.944 0 0 1 12 21c-2.17 0-4.207-.576-5.963-1.584A6.062 6.062 0 0 1 6 18.719m12 0a5.971 5.971 0 0 0-.941-3.197m0 0A5.995 5.995 0 0 0 12 12.75a5.995 5.995 0 0 0-5.058 2.772m0 0a3 3 0 0 0-4.681 2.72 8.986 8.986 0 0 0 3.74.477m.94-3.197a5.971 5.971 0 0 0-.94 3.197M15 6.75a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm6 3a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Zm-13.5 0a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Z" />
+                                </svg>
                                 <p class="text-white">Accounts</p>
                             </div>
                             <div>
@@ -102,7 +106,9 @@
                         <div
                             class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <img src="{% static 'images/icons/work.png' %}" class="w-[30px]">
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 9.776c.112-.017.227-.026.344-.026h15.812c.117 0 .232.009.344.026m-16.5 0a2.25 2.25 0 0 0-1.883 2.542l.857 6a2.25 2.25 0 0 0 2.227 1.932H19.05a2.25 2.25 0 0 0 2.227-1.932l.857-6a2.25 2.25 0 0 0-1.883-2.542m-16.5 0V6A2.25 2.25 0 0 1 6 3.75h3.879a1.5 1.5 0 0 1 1.06.44l2.122 2.12a1.5 1.5 0 0 0 1.06.44H18A2.25 2.25 0 0 1 20.25 9v.776" />
+                                </svg>
                                 <p class="text-white">My Work</p>
                             </div>
                             <div>
@@ -127,7 +133,7 @@
                                 </div>
                             </a>
 
-                            <a>
+                            <a href="{% url 'tickets' %}">
                                 <div
                                     class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2">
                                     <p class="text-white">Tickets</p>
@@ -152,7 +158,9 @@
                     <!-- SUPPORT DROPDOWN -->
                     <div class="w-full flex justify-between items-center border-b border-slate-600 py-3">
                         <div class="w-full flex justify-start items-center gap-3">
-                            <img src="{% static 'images/icons/support.png' %}" class="w-[30px]">
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M20.25 8.511c.884.284 1.5 1.128 1.5 2.097v4.286c0 1.136-.847 2.1-1.98 2.193-.34.027-.68.052-1.02.072v3.091l-3-3c-1.354 0-2.694-.055-4.02-.163a2.115 2.115 0 0 1-.825-.242m9.345-8.334a2.126 2.126 0 0 0-.476-.095 48.64 48.64 0 0 0-8.048 0c-1.131.094-1.976 1.057-1.976 2.192v4.286c0 .837.46 1.58 1.155 1.951m9.345-8.334V6.637c0-1.621-1.152-3.026-2.76-3.235A48.455 48.455 0 0 0 11.25 3c-2.115 0-4.198.137-6.24.402-1.608.209-2.76 1.614-2.76 3.235v6.226c0 1.621 1.152 3.026 2.76 3.235.577.075 1.157.14 1.74.194V21l4.155-4.155" />
+                            </svg>
                             <p class="text-white">Support</p>
                         </div>
                         <div>
@@ -163,10 +171,13 @@
 
                     <!-- BILLING DROPDOWN -->
                     {% if user.is_superuser %}
-                    <div class="w-full">
-                        <div class="w-full flex justify-between items-center border-b border-slate-600 py-3">
+                    <div class="w-full menu-container">
+                        <div
+                            class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <img src="{% static 'images/icons/billing.png' %}" class="w-[30px]">
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 18.75a60.07 60.07 0 0 1 15.797 2.101c.727.198 1.453-.342 1.453-1.096V18.75M3.75 4.5v.75A.75.75 0 0 1 3 6h-.75m0 0v-.375c0-.621.504-1.125 1.125-1.125H20.25M2.25 6v9m18-10.5v.75c0 .414.336.75.75.75h.75m-1.5-1.5h.375c.621 0 1.125.504 1.125 1.125v9.75c0 .621-.504 1.125-1.125 1.125h-.375m1.5-1.5H21a.75.75 0 0 0-.75.75v.75m0 0H3.75m0 0h-.375a1.125 1.125 0 0 1-1.125-1.125V15m1.5 1.5v-.75A.75.75 0 0 0 3 15h-.75M15 10.5a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm3 0h.008v.008H18V10.5Zm-12 0h.008v.008H6V10.5Z" />
+                                </svg>
                                 <p class="text-white">Billing</p>
                             </div>
                             <div>
@@ -175,15 +186,48 @@
                                     style="font-size: 18px; color: white; display: none;"></i>
                             </div>
                         </div>
+
+                        <div class="menuDropdownItems w-full h-fit p-3 hidden duration-300">
+                            <a href="{% url 'items' %}">
+                                <div
+                                    class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
+                                    <p class="text-white">Items</p>
+                                </div>
+                            </a>
+
+                            <a href="{% url 'orders' %}">
+                                <div
+                                    class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
+                                    <p class="text-white">Orders</p>
+                                </div>
+                            </a>
+
+                            <a href="{% url 'invoices' %}">
+                                <div
+                                    class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
+                                    <p class="text-white">Invoices</p>
+                                </div>
+                            </a>
+
+                            <a href="">
+                                <div
+                                    class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
+                                    <p class="text-white">Receipts</p>
+                                </div>
+                            </a>
+                        </div>
                     </div>
                     {% endif %}
 
+
                     <!-- UTILITIES DROPDOWN -->
                     <div class="w-full menu-container">
                         <div
                             class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <img src="{% static 'images/icons/utilities.png' %}" class="w-[30px]">
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"  class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12a7.5 7.5 0 0 0 15 0m-15 0a7.5 7.5 0 1 1 15 0m-15 0H3m16.5 0H21m-1.5 0H12m-8.457 3.077 1.41-.513m14.095-5.13 1.41-.513M5.106 17.785l1.15-.964m11.49-9.642 1.149-.964M7.501 19.795l.75-1.3m7.5-12.99.75-1.3m-6.063 16.658.26-1.477m2.605-14.772.26-1.477m0 17.726-.26-1.477M10.698 4.614l-.26-1.477M16.5 19.794l-.75-1.299M7.5 4.205 12 12m6.894 5.785-1.149-.964M6.256 7.178l-1.15-.964m15.352 8.864-1.41-.513M4.954 9.435l-1.41-.514M12.002 12l-3.75 6.495" />
+                                </svg>
                                 <p class="text-white">Utilities</p>
                             </div>
                             <div>
@@ -194,6 +238,15 @@
                         </div>
 
                         <div class="menuDropdownItems w-full h-fit p-3 hidden duration-300">
+
+                            <a href="{% url 'departments' %}">
+                                <div
+                                    class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
+                                    <p class="text-white">Departments</p>
+                                </div>
+                            </a>
+
+
                             <a href="{% url 'projecttypes' %}">
                                 <div
                                     class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
@@ -230,6 +283,14 @@
                                 </div>
                             </a>
 
+
+                            <a href="{% url 'paymentmethods' %}">
+                                <div
+                                    class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
+                                    <p class="text-white">Payment Methods</p>
+                                </div>
+                            </a>
+
                             <a>
                                 <div
                                     class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
@@ -241,7 +302,9 @@
 
                     <a class="w-full">
                         <div class="w-full flex justify-start items-center gap-3 border-b border-slate-600 py-3">
-                            <img src="{% static 'images/icons/activity.png' %}" class="w-[30px]">
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 3v11.25A2.25 2.25 0 0 0 6 16.5h2.25M3.75 3h-1.5m1.5 0h16.5m0 0h1.5m-1.5 0v11.25A2.25 2.25 0 0 1 18 16.5h-2.25m-7.5 0h7.5m-7.5 0-1 3m8.5-3 1 3m0 0 .5 1.5m-.5-1.5h-9.5m0 0-.5 1.5m.75-9 3-3 2.148 2.148A12.061 12.061 0 0 1 16.5 7.605" />
+                            </svg>
                             <p class="text-white">Activity</p>
                         </div>
                     </a>
@@ -261,7 +324,6 @@
             </div>
         </div>
 
-
         <!-- MOBILE FIXED SIDE BAR -->
         <div class="w-full h-[100vh] absolute bg-black bg-opacity-40 z-50 mt-[80px] mobileFixedSideHeader hidden">
             <div class="w-[70%] h-full bg-osiblue flex flex-col gap-3 relative">
@@ -287,7 +349,9 @@
                     <div class="w-full h-fit bg-secondosiblue px-5 flex flex-col hidden" id="mobileUserProfileDropdown">
                         <a href="{% url 'signout' %}" class="w-full">
                             <div class="w-full py-3 flex items-center gap-2 text-white text-[16px]">
-                                <img src="{% static 'images/icons/logout.png' %}" class="w-[22px]">
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M5.636 5.636a9 9 0 1 0 12.728 0M12 3v9" />
+                                </svg>    
                                 <p>Logout</p>
                             </div>
                         </a>
@@ -303,7 +367,9 @@
                         <div
                             class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <img src="{% static 'images/icons/users.png' %}" class="w-[28px]">
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M18 18.72a9.094 9.094 0 0 0 3.741-.479 3 3 0 0 0-4.682-2.72m.94 3.198.001.031c0 .225-.012.447-.037.666A11.944 11.944 0 0 1 12 21c-2.17 0-4.207-.576-5.963-1.584A6.062 6.062 0 0 1 6 18.719m12 0a5.971 5.971 0 0 0-.941-3.197m0 0A5.995 5.995 0 0 0 12 12.75a5.995 5.995 0 0 0-5.058 2.772m0 0a3 3 0 0 0-4.681 2.72 8.986 8.986 0 0 0 3.74.477m.94-3.197a5.971 5.971 0 0 0-.94 3.197M15 6.75a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm6 3a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Zm-13.5 0a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Z" />
+                                </svg>
                                 <p class="text-white">Accounts</p>
                             </div>
                             <div>
@@ -343,7 +409,9 @@
                         <div
                             class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <img src="{% static 'images/icons/work.png' %}" class="w-[28px]">
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 9.776c.112-.017.227-.026.344-.026h15.812c.117 0 .232.009.344.026m-16.5 0a2.25 2.25 0 0 0-1.883 2.542l.857 6a2.25 2.25 0 0 0 2.227 1.932H19.05a2.25 2.25 0 0 0 2.227-1.932l.857-6a2.25 2.25 0 0 0-1.883-2.542m-16.5 0V6A2.25 2.25 0 0 1 6 3.75h3.879a1.5 1.5 0 0 1 1.06.44l2.122 2.12a1.5 1.5 0 0 0 1.06.44H18A2.25 2.25 0 0 1 20.25 9v.776" />
+                                </svg>
                                 <p class="text-white">My Work</p>
                             </div>
                             <div>
@@ -368,7 +436,7 @@
                                 </div>
                             </a>
 
-                            <a>
+                            <a href="{% url 'tickets' %}">
                                 <div
                                     class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2">
                                     <p class="text-white">My Tickets</p>
@@ -392,7 +460,9 @@
 
                     <div class="w-full flex justify-between items-center border-b border-slate-600 py-3">
                         <div class="w-full flex justify-start items-center gap-3">
-                            <img src="{% static 'images/icons/support.png' %}" class="w-[28px]">
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M20.25 8.511c.884.284 1.5 1.128 1.5 2.097v4.286c0 1.136-.847 2.1-1.98 2.193-.34.027-.68.052-1.02.072v3.091l-3-3c-1.354 0-2.694-.055-4.02-.163a2.115 2.115 0 0 1-.825-.242m9.345-8.334a2.126 2.126 0 0 0-.476-.095 48.64 48.64 0 0 0-8.048 0c-1.131.094-1.976 1.057-1.976 2.192v4.286c0 .837.46 1.58 1.155 1.951m9.345-8.334V6.637c0-1.621-1.152-3.026-2.76-3.235A48.455 48.455 0 0 0 11.25 3c-2.115 0-4.198.137-6.24.402-1.608.209-2.76 1.614-2.76 3.235v6.226c0 1.621 1.152 3.026 2.76 3.235.577.075 1.157.14 1.74.194V21l4.155-4.155" />
+                            </svg>
                             <p class="text-white">Support</p>
                         </div>
                         <div>
@@ -401,11 +471,15 @@
                         </div>
                     </div>
 
+                    <!-- BILLING DROPDOWN -->
                     {% if user.is_superuser %}
-                    <div class="w-full">
-                        <div class="w-full flex justify-between items-center border-b border-slate-600 py-3">
+                    <div class="w-full menu-container">
+                        <div
+                            class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <img src="{% static 'images/icons/billing.png' %}" class="w-[28px]">
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 18.75a60.07 60.07 0 0 1 15.797 2.101c.727.198 1.453-.342 1.453-1.096V18.75M3.75 4.5v.75A.75.75 0 0 1 3 6h-.75m0 0v-.375c0-.621.504-1.125 1.125-1.125H20.25M2.25 6v9m18-10.5v.75c0 .414.336.75.75.75h.75m-1.5-1.5h.375c.621 0 1.125.504 1.125 1.125v9.75c0 .621-.504 1.125-1.125 1.125h-.375m1.5-1.5H21a.75.75 0 0 0-.75.75v.75m0 0H3.75m0 0h-.375a1.125 1.125 0 0 1-1.125-1.125V15m1.5 1.5v-.75A.75.75 0 0 0 3 15h-.75M15 10.5a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm3 0h.008v.008H18V10.5Zm-12 0h.008v.008H6V10.5Z" />
+                                </svg>
                                 <p class="text-white">Billing</p>
                             </div>
                             <div>
@@ -414,16 +488,48 @@
                                     style="font-size: 18px; color: white; display: none;"></i>
                             </div>
                         </div>
-                    </div>
 
+                        <div class="menuDropdownItems w-full h-fit p-3 hidden duration-300">
+                            <a href="{% url 'items' %}">
+                                <div
+                                    class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
+                                    <p class="text-white">Items</p>
+                                </div>
+                            </a>
+
+                            <a href="{% url 'orders' %}">
+                                <div
+                                    class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
+                                    <p class="text-white">Orders</p>
+                                </div>
+                            </a>
+
+                            <a href="{% url 'invoices' %}">
+                                <div
+                                    class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
+                                    <p class="text-white">Invoices</p>
+                                </div>
+                            </a>
+
+                            <a href="">
+                                <div
+                                    class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
+                                    <p class="text-white">Receipts</p>
+                                </div>
+                            </a>
+                        </div>
+                    </div>
                     {% endif %}
 
+
                     <!-- UTILITIES -->
                     <div class="w-full menu-container">
                         <div
                             class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <img src="{% static 'images/icons/utilities.png' %}" class="w-[28px]">
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"  class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12a7.5 7.5 0 0 0 15 0m-15 0a7.5 7.5 0 1 1 15 0m-15 0H3m16.5 0H21m-1.5 0H12m-8.457 3.077 1.41-.513m14.095-5.13 1.41-.513M5.106 17.785l1.15-.964m11.49-9.642 1.149-.964M7.501 19.795l.75-1.3m7.5-12.99.75-1.3m-6.063 16.658.26-1.477m2.605-14.772.26-1.477m0 17.726-.26-1.477M10.698 4.614l-.26-1.477M16.5 19.794l-.75-1.299M7.5 4.205 12 12m6.894 5.785-1.149-.964M6.256 7.178l-1.15-.964m15.352 8.864-1.41-.513M4.954 9.435l-1.41-.514M12.002 12l-3.75 6.495" />
+                                </svg>
                                 <p class="text-white">Utilities</p>
                             </div>
                             <div>
@@ -434,6 +540,15 @@
                         </div>
 
                         <div class="menuDropdownItems w-full h-fit p-3 hidden duration-300">
+
+                            <a href="{% url 'departments' %}">
+                                <div
+                                    class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
+                                    <p class="text-white">Departments</p>
+                                </div>
+                            </a>
+
+
                             <a href="{% url 'projecttypes' %}">
                                 <div
                                     class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
@@ -470,6 +585,13 @@
                                 </div>
                             </a>
 
+                            <a href="{% url 'paymentmethods' %}">
+                                <div
+                                    class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
+                                    <p class="text-white">Payment Methods</p>
+                                </div>
+                            </a>
+
                             <a>
                                 <div
                                     class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
@@ -481,7 +603,9 @@
 
                     <a class="w-full">
                         <div class="w-full flex justify-start items-center gap-3 border-b border-slate-600 py-3">
-                            <img src="{% static 'images/icons/activity.png' %}" class="w-[28px]">
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 3v11.25A2.25 2.25 0 0 0 6 16.5h2.25M3.75 3h-1.5m1.5 0h16.5m0 0h1.5m-1.5 0v11.25A2.25 2.25 0 0 1 18 16.5h-2.25m-7.5 0h7.5m-7.5 0-1 3m8.5-3 1 3m0 0 .5 1.5m-.5-1.5h-9.5m0 0-.5 1.5m.75-9 3-3 2.148 2.148A12.061 12.061 0 0 1 16.5 7.605" />
+                            </svg>
                             <p class="text-white">Activity</p>
                         </div>
                     </a>
@@ -509,38 +633,65 @@
                         <button
                             class="w-[30px] h-[30px] rounded-full p-2 bg-gray-300 text-white text-[16px] outline-none border-none cursor-pointer flex justify-center items-center shadow-md addStatusButton hover:bg-osiblue duration-300"
                             data-modal-url="{% url 'addstatusmodal' %}">
-                            <i class="fa fa-plus"></i>
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="3" stroke="currentColor" class="w-[20px]">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
+                            </svg>
+                              
                         </button>
                     </div>
                 </div>
 
-                <div class="relative">
-                    <div class="w-fit flex justify-between items-center gap-2 cursor-pointer hover:bg-gray-50 rounded-md hover:p-2 duration-300"
-                        id="userProfile">
-                        <div>
-                            <div class="w-[40px] s:w-[45px] h-[40px] s:h-[45px] rounded-full shadow-md">
-                                <img src='{{request.user.staffprofile.image.url}}' alt="user-image"
-                                    class="w-full h-full object-cover rounded-full">
-                            </div>
-                        </div>
 
-                        <div class="flex justify-center items-center gap-2 text-gray-500">
-                            <p>{{request.user.first_name}} {{request.user.last_name}}</p>
-                            <i class="fa fa-angle-down" id="arrowDown"></i>
-                            <i class="fa fa-angle-up" style="display: none;" id="arrowUp"></i>
+                <div class="flex justify-end items-center gap-5">
+                    <!-- NOTIFICATION -->
+                    <div class="relative cursor-pointer hover:scale-105 duration-300 transition-transform" id="openNotificationsSideBar">
+                        <div
+                            class="w-[20px] h-[20px] rounded-full bg-secondosiblue text-white flex justify-center items-center text-sm p-1 absolute top-[-5px] right-[-5px]">
+                            <p>1</p>
+                        </div>
+                        <div
+                            class="w-[40px] s:w-[45px] h-[40px] s:h-[45px] rounded-full shadow-md bg-gray-50 border border-gray-100 flex justify-center items-center">
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                                stroke="currentColor" class="w-6 h-6 text-secondosiblue">
+                                <path stroke-linecap="round" stroke-linejoin="round"
+                                    d="M14.857 17.082a23.848 23.848 0 0 0 5.454-1.31A8.967 8.967 0 0 1 18 9.75V9A6 6 0 0 0 6 9v.75a8.967 8.967 0 0 1-2.312 6.022c1.733.64 3.56 1.085 5.455 1.31m5.714 0a24.255 24.255 0 0 1-5.714 0m5.714 0a3 3 0 1 1-5.714 0" />
+                            </svg>
                         </div>
                     </div>
 
-                    <!-- USER PROFILE DROPDOWN -->
-                    <div class="w-[250px] h-fit bg-osiblue bg-opacity-70 rounded-md shadow-md px-3 absolute right-0 mt-3 flex flex-col"
-                        style="display: none;" id="userProfileDropdown">
-                        <a href="{% url 'signout' %}" class="w-full">
-                            <div
-                                class="w-full py-3 flex items-center gap-2 text-white hover:text-osiblue duration-300 cursor-pointer">
-                                <img src="{% static 'images/icons/logout.png' %}" class="w-[22px]">
-                                <p>Logout</p>
+
+                    <div class="relative">
+                        <div class="w-fit flex justify-between items-center gap-2 cursor-pointer hover:bg-gray-50 rounded-md hover:p-2 duration-300"
+                            id="userProfile">
+                            <div>
+                                <div class="w-[40px] s:w-[45px] h-[40px] s:h-[45px] rounded-full shadow-md">
+                                    <img src='{{request.user.staffprofile.image.url}}' alt="user-image"
+                                        class="w-full h-full object-cover rounded-full">
+                                </div>
                             </div>
-                        </a>
+
+                            <div class="flex justify-center items-center gap-2 text-gray-500">
+                                <p>{{request.user.first_name}} {{request.user.last_name}}</p>
+                                <i class="fa fa-angle-down" id="arrowDown"></i>
+                                <i class="fa fa-angle-up" style="display: none;" id="arrowUp"></i>
+                            </div>
+                        </div>
+
+                        <!-- USER PROFILE DROPDOWN -->
+                        <div class="w-[250px] h-fit bg-osiblue bg-opacity-70 rounded-md shadow-md px-3 absolute right-0 mt-3 flex flex-col"
+                            style="display: none;" id="userProfileDropdown">
+                            <a href="{% url 'signout' %}" class="w-full">
+                                <div
+                                    class="w-full py-3 flex items-center gap-2 text-white hover:text-osiblue duration-300 cursor-pointer">
+                                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                        stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                        <path stroke-linecap="round" stroke-linejoin="round"
+                                            d="M5.636 5.636a9 9 0 1 0 12.728 0M12 3v9" />
+                                    </svg>
+                                    <p>Logout</p>
+                                </div>
+                            </a>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -550,7 +701,7 @@
             <div
                 class="w-full h-[80px] bg-osiblue shadow-md px-5 s:px-9 py-5 flex xlg1:hidden justify-between items-center mobileTopHeader">
                 <a href="{% url 'home' %}">
-                    <img src="{% static 'images/osinaw.png' %}" class="w-[130px] h-auto">
+                    <img src="{% static 'images/ositcom_logos/osinawhite.png' %}" class="w-[130px] h-auto">
                 </a>
 
                 <div class="w-fit flex flex-col gap-2 cursor-pointer" id="mobileBurgerMenuButton">
@@ -560,7 +711,11 @@
                 </div>
 
                 <div class="w-fit cursor-pointer hidden" id="mobileCloseMenuButton">
-                    <img src="{% static 'images/closeicon.png' %}" class="w-[25px]">
+                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                        stroke="currentColor" class="w-[40px] text-white">
+                        <path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12" />
+                    </svg>
+
                 </div>
             </div>
 
@@ -577,7 +732,8 @@
             <div class="bg-osiblue h-fit py-2 mobileFooter">
                 <div class="w-full flex flex-col justify-center items-center gap-1">
                     <div class="flex justify-center items-center gap-2">
-                        <img src="{% static 'images/ositcom_logos/ositcomwhite(o).png' %}" alt="Ositcom Logo" class="w-[30px] h-[25px]">
+                        <img src="{% static 'images/ositcom_logos/ositcomwhite(o).png' %}" alt="Ositcom Logo"
+                            class="w-[30px] h-[25px]">
                         <p class="text-gray-200 font-light text-xs">Powered By OSITCOM</p>
                     </div>
                     <p class="text-gray-200 font-light text-xs">Copyrights © 2024 All Rights Reserved</p>
@@ -599,6 +755,9 @@
     <!-- TO RELOAD THE USERS ACTIVITY CONTAINER -->
     <script type="text/javascript" src='{% static "js/get-updated-user-activity.js" %}'></script>   
 
+    <!-- TO RELOAD THE STATUS CONTAINER -->
+    <script type="text/javascript" src='{% static "js/get-updated-last-status.js" %}'></script>
+
 </body>
 
 </html>
\ No newline at end of file