diff --git a/lib/models/pending_suppliers_model.dart b/lib/models/pending_suppliers_model.dart index f0adcc2..f8ef2a6 100644 --- a/lib/models/pending_suppliers_model.dart +++ b/lib/models/pending_suppliers_model.dart @@ -16,7 +16,7 @@ class PendingSuppliersModel { PendingSuppliersModel rtvm = new PendingSuppliersModel(); rtvm.customer_name = json['username'] ?? ''; - rtvm.customer_phone_number = json['contactNumber'] ?? ''; + rtvm.customer_phone_number = json['phone'] ?? ''; rtvm.customer_address = json['profile']['address1'] ?? ''; rtvm.customer_id = json['customerId'] ?? ''; return rtvm; diff --git a/lib/request_customers.dart b/lib/request_customers.dart index 683f05c..afc6556 100644 --- a/lib/request_customers.dart +++ b/lib/request_customers.dart @@ -100,7 +100,7 @@ class _PendingCustomersState extends State { Text('contactNumber:', style: labelTextStyle()), SizedBox(height: 10,), - Text('address1:', + Text('address:', style: labelTextStyle()), ], ), @@ -141,25 +141,18 @@ class _PendingCustomersState extends State { color:primaryColor/*FilteredList[index].text_color*/ ), ), onPressed: () async{ - /* var payload = new Map(); - payload["customerId"] =AppSettings.customerId; - payload["supplierId"] = FilteredList[index].supplier_id; - - bool requestStatus = await AppSettings.connectRequest(payload); + var payload = new Map(); + payload["supplierId"] =AppSettings.supplierId; + bool requestStatus = await AppSettings.acceptRequest(payload); if(requestStatus){ - AppSettings.longSuccessToast("Request Sent Successfully"); - await getAllSuppliersData(); - await getConnectedSuppliersData(); + AppSettings.longSuccessToast("Request Accepted Successfully"); + // await getConnectedSuppliersData(); await getPendingSuppliersData(); } else{ - - }*/ - - - + } }, ), @@ -226,7 +219,7 @@ class _PendingCustomersState extends State { return SafeArea( child: Scaffold( appBar: AppSettings.appBar('Pending Customers'), - body: isLoading?Center( + body: isPendingDataLoading?Center( child: CircularProgressIndicator( color: primaryColor, strokeWidth: 5.0, diff --git a/lib/settings.dart b/lib/settings.dart index 40836a6..8ccf1ac 100644 --- a/lib/settings.dart +++ b/lib/settings.dart @@ -93,6 +93,8 @@ class AppSettings { static String updateDeliveryboyUrl = host + 'updatedeliveryboy'; static String deleteDeliveryboyUrl = host + 'deletedeliveryboy'; static String pendingCustomersUrl = host + 'pendingCustomers'; + static String acceptRequestUrl = host + 'friend-request/{id}/accept'; + @@ -577,6 +579,43 @@ class AppSettings { } + static Future acceptRequest( payload) async { + var uri = Uri.parse(acceptRequestUrl ); + try { + var response = await http.post(uri, + body: json.encode(payload), headers: await buildRequestHeaders()); + + if (response.statusCode == 200) { + return true; + } else if (response.statusCode == 401) { + bool status = await AppSettings.resetToken(); + if (status) { + response = await http.put(uri, + body: json.encode(payload), headers: await buildRequestHeaders()); + if (response.statusCode == 200) { + return true; + } else { + return false; + } + } else { + return false; + } + } else { + return false; + } + } catch (e) { + print(e); + return false; + } + } + + + + + + + + /*Apis ends here*/