PFM-4409

egovernments · Oct 26, 2023 · 6b026a5 · 6b026a5
1 parent 93056b3
commit 6b026a5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/frontend/mgramseva/lib/providers/expenses_details_provider.dart b/frontend/mgramseva/lib/providers/expenses_details_provider.dart
@@ -405,8 +405,14 @@ class ExpensesDetailsProvider with ChangeNotifier {
       if(expenditureDetails.selectedVendor != null && (expenditureDetails.selectedVendor?.owner?.mobileNumber == null || expenditureDetails.selectedVendor!.owner!.mobileNumber.isEmpty)){
         var mobileNumber = vendorList.firstWhere((vendor) => vendor.id == expenditureDetails.vendorId, orElse: () => Vendor('', '')).owner?.mobileNumber ?? '';
         expenditureDetails.selectedVendor?.owner = Owner(mobileNumber);
+        if(expenditureDetails.mobileNumberController.text.isNotEmpty && expenditureDetails.mobileNumberController.text!=mobileNumber){
+          return true;
+        }
         expenditureDetails.mobileNumberController.text = mobileNumber;
       }
+      if(expenditureDetails.mobileNumberController.text.isEmpty){
+        return true;
+      }
       return false;
     }
     else {

diff --git a/frontend/mgramseva/lib/repository/expenses_repo.dart b/frontend/mgramseva/lib/repository/expenses_repo.dart
@@ -56,16 +56,17 @@ class ExpensesRepository extends BaseService {
         ));
 
     if (res != null && res['vendor'] != null) {
-      var vendors = res['vendor'];
-      vendorList = [];
-      for (int i =0;i<vendors.length;i++){
-        if(vendors[i]!=null){
-          if(vendors[i]['owner']==null){
-            continue;
-          }
-          vendorList.add(Vendor.fromJson(vendors[i]));
-        }
-      }
+      vendorList =
+          res['vendor'].map<Vendor>((e) {
+            if(e!=null){
+              if(e['owner']==null){
+                e['owner']={
+                  'mobileNumber':''
+                };
+              }
+            }
+            return Vendor.fromJson(e);
+          }).toList();
     }
     return vendorList;
   }