From dfd48981478c590435ddb8f1c9b8f46d0fe15519 Mon Sep 17 00:00:00 2001
From: HagerSayed22 <hsayed@sirius-its.com>
Date: Mon, 16 Oct 2023 10:26:59 +0300
Subject: [PATCH] remove router from order and handel null error in installment
 page

---
 .../src/app/core/layout/side-bar/side-bar.component.html      | 2 +-
 .../edit-installment/receipt/receipt.component.html           | 2 +-
 .../src/app/pages/installments/installment.component.html     | 3 ++-
 .../src/app/pages/installments/installment.component.ts       | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/retail-managment-system/rms-ui/src/app/core/layout/side-bar/side-bar.component.html b/retail-managment-system/rms-ui/src/app/core/layout/side-bar/side-bar.component.html
index 963af996..ce7f3b5b 100644
--- a/retail-managment-system/rms-ui/src/app/core/layout/side-bar/side-bar.component.html
+++ b/retail-managment-system/rms-ui/src/app/core/layout/side-bar/side-bar.component.html
@@ -7,7 +7,7 @@
     }}</a>
   </p>
   <p>
-    <a mat-button routerLink="order" routerLinkActive="active" class="fs-5">{{
+    <a mat-button class="fs-5">{{
       "sidebar.order" | translate
     }}</a>
   </p>
diff --git a/retail-managment-system/rms-ui/src/app/pages/installments/edit-installment/receipt/receipt.component.html b/retail-managment-system/rms-ui/src/app/pages/installments/edit-installment/receipt/receipt.component.html
index 54f82fc5..a5dd3c42 100644
--- a/retail-managment-system/rms-ui/src/app/pages/installments/edit-installment/receipt/receipt.component.html
+++ b/retail-managment-system/rms-ui/src/app/pages/installments/edit-installment/receipt/receipt.component.html
@@ -8,7 +8,7 @@ <h3 class="panel-title w-100 text-cprint-sectionenter fw-bold ">
       <tbody>
         <tr>
           <th scope="col"> {{ "installments.customer-name" | translate }} :</th>
-          <td>{{install.order.customer.fullName}}</td>
+          <td>{{install.order?.customer?.fullName}}</td>
         </tr>
         <tr>
           <th scope="col">{{ "installments.ins-amount" | translate }} :</th>
diff --git a/retail-managment-system/rms-ui/src/app/pages/installments/installment.component.html b/retail-managment-system/rms-ui/src/app/pages/installments/installment.component.html
index b0c8d66b..a67e2cab 100644
--- a/retail-managment-system/rms-ui/src/app/pages/installments/installment.component.html
+++ b/retail-managment-system/rms-ui/src/app/pages/installments/installment.component.html
@@ -43,7 +43,8 @@ <h3 class="panel-title fw-bold">
               {{ "installments.customer-name" | translate }}
             </th>
             <td mat-cell *matCellDef="let element">
-              {{ element.order.customer.fullName }}
+               {{ element.order?.customer?.fullName }} 
+              
             </td>
           </ng-container>
 
diff --git a/retail-managment-system/rms-ui/src/app/pages/installments/installment.component.ts b/retail-managment-system/rms-ui/src/app/pages/installments/installment.component.ts
index 86e92429..b6c71fa5 100644
--- a/retail-managment-system/rms-ui/src/app/pages/installments/installment.component.ts
+++ b/retail-managment-system/rms-ui/src/app/pages/installments/installment.component.ts
@@ -56,9 +56,9 @@ export class InstallmentComponent implements OnInit  {
           const matchFilter:any[] = [];
           const filters = JSON.parse(filtersJson);
           filters.forEach(filter => {
-            data[filter.id] = data.order.customer.fullName;
+            data[filter.id] = data.order?.customer?.fullName;
             const val = data[filter.id] === null ? '' : data[filter.id];
-            matchFilter.push(val.toLowerCase().includes(filter.value.toLowerCase()));
+            matchFilter.push(val?.toLowerCase().includes(filter.value?.toLowerCase()));
           });
             return matchFilter.every(Boolean);
         };