Update codebase
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
import 'package:tripz_driver/constant/currency.dart';
|
||||
import 'package:siro_driver/constant/currency.dart';
|
||||
import 'dart:convert';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:tripz_driver/constant/box_name.dart';
|
||||
import 'package:tripz_driver/constant/links.dart';
|
||||
import 'package:tripz_driver/controller/functions/crud.dart';
|
||||
import 'package:siro_driver/constant/box_name.dart';
|
||||
import 'package:siro_driver/constant/links.dart';
|
||||
import 'package:siro_driver/controller/functions/crud.dart';
|
||||
import '../../../main.dart';
|
||||
|
||||
// ════════════════════════════════════════════
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import 'dart:convert';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:tripz_driver/constant/box_name.dart';
|
||||
import 'package:tripz_driver/constant/links.dart';
|
||||
import 'package:tripz_driver/controller/functions/crud.dart';
|
||||
import 'package:siro_driver/constant/box_name.dart';
|
||||
import 'package:siro_driver/constant/links.dart';
|
||||
import 'package:siro_driver/controller/functions/crud.dart';
|
||||
import '../../main.dart';
|
||||
|
||||
// ════════════════════════════════════════════
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import 'dart:convert';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:tripz_driver/constant/box_name.dart';
|
||||
import 'package:tripz_driver/constant/links.dart';
|
||||
import 'package:tripz_driver/controller/functions/crud.dart';
|
||||
import 'package:siro_driver/constant/box_name.dart';
|
||||
import 'package:siro_driver/constant/links.dart';
|
||||
import 'package:siro_driver/controller/functions/crud.dart';
|
||||
import '../../main.dart';
|
||||
|
||||
class LeaderboardEntry {
|
||||
@@ -56,7 +56,7 @@ class LeaderboardController extends GetxController {
|
||||
payload: {'type': 'trips'},
|
||||
);
|
||||
if (resTrips != null && resTrips != 'failure') {
|
||||
var data = jsonDecode(resTrips);
|
||||
var data = _decode(resTrips);
|
||||
if (data['message'] is List) {
|
||||
tripLeaderboard = (data['message'] as List).map((e) => LeaderboardEntry(
|
||||
driverId: e['driver_id'].toString(),
|
||||
@@ -75,7 +75,7 @@ class LeaderboardController extends GetxController {
|
||||
payload: {'type': 'earnings'},
|
||||
);
|
||||
if (resEarnings != null && resEarnings != 'failure') {
|
||||
var data = jsonDecode(resEarnings);
|
||||
var data = _decode(resEarnings);
|
||||
if (data['message'] is List) {
|
||||
earningsLeaderboard = (data['message'] as List).map((e) => LeaderboardEntry(
|
||||
driverId: e['driver_id'].toString(),
|
||||
@@ -99,4 +99,17 @@ class LeaderboardController extends GetxController {
|
||||
isLoading = false;
|
||||
update();
|
||||
}
|
||||
|
||||
/// CRUD().post تُرجع الردّ **مفكوكاً** أصلاً (Map)، بينما CRUD().get
|
||||
/// تُرجع نصاً. تمرير الـ Map إلى jsonDecode كان يرمي
|
||||
/// "type '_Map<String, dynamic>' is not a subtype of type 'String'"،
|
||||
/// فتُبتلع لوحة الصدارة في catch وتظهر فارغة دائماً مهما صحّ الردّ.
|
||||
Map<String, dynamic> _decode(dynamic res) {
|
||||
if (res is Map) return Map<String, dynamic>.from(res);
|
||||
if (res is String && res.isNotEmpty) {
|
||||
final decoded = jsonDecode(res);
|
||||
if (decoded is Map) return Map<String, dynamic>.from(decoded);
|
||||
}
|
||||
return <String, dynamic>{};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,9 +2,9 @@ import 'dart:convert';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:tripz_driver/constant/box_name.dart';
|
||||
import 'package:tripz_driver/constant/links.dart';
|
||||
import 'package:tripz_driver/controller/functions/crud.dart';
|
||||
import 'package:siro_driver/constant/box_name.dart';
|
||||
import 'package:siro_driver/constant/links.dart';
|
||||
import 'package:siro_driver/controller/functions/crud.dart';
|
||||
import '../../main.dart';
|
||||
|
||||
// ════════════════════════════════════════════
|
||||
@@ -136,13 +136,13 @@ class ReferralController extends GetxController {
|
||||
}
|
||||
|
||||
String get shareMessage {
|
||||
final appName = 'Tripz';
|
||||
return 'Join $appName as a driver! Use my code: $referralCode\nDownload: https://tripz.app/driver?ref=$referralCode';
|
||||
final appName = 'Siro';
|
||||
return 'Join $appName as a driver! Use my code: $referralCode\n${AppLink.driverDownloadLinks}';
|
||||
}
|
||||
|
||||
String get shareMessagePassenger {
|
||||
final appName = 'Tripz';
|
||||
return 'Get a ride with $appName! Use my code: $referralCode for a discount.\nDownload: https://tripz.app?ref=$referralCode';
|
||||
final appName = 'Siro';
|
||||
return 'Get a ride with $appName! Use my code: $referralCode for a discount.\nDownload: https://siro.app?ref=$referralCode';
|
||||
}
|
||||
|
||||
int get totalReferrals => totalDriverReferrals + totalPassengerReferrals;
|
||||
|
||||
Reference in New Issue
Block a user