25-6-23/1

lib/controller/home/payment/captain_wallet_controller.dart

@@ -82,7 +82,7 @@ class CaptainWalletController extends GetxController {
         //get new driver details
         isNewTransfer = true;
         update();
-        var res = await CRUD().getWallet(
+        var res = await CRUD().get(
             link: AppLink.getDriverDetails,
             payload: {'driver_phone': '+2${newDriverPhoneController.text}'});
         isNewTransfer = false;
@@ -155,7 +155,7 @@ class CaptainWalletController extends GetxController {
       'driverID': box.read(BoxName.driverID).toString(),
       'amount': amount.toString(),
     });
-    var d = jsonDecode(res);
+    var d = (res);
     return d['message'];
   }
 
@@ -168,14 +168,14 @@ class CaptainWalletController extends GetxController {
       'amount': amount.toString(),
       'payment_method': paymentMethod.toString(),
     });
-    var d = jsonDecode(res);
+    var d = (res);
     // paymentID = d['message'].toString();
     return d['message'];
   }
 
   Future addDriverWallet(String paymentMethod, point, count) async {
     paymentToken = await generateToken(count);
-    var paymentID = await getPaymentId(paymentMethod, point);
+    var paymentID = await getPaymentId(paymentMethod, point.toString());
     await CRUD().postWallet(link: AppLink.addDriversWalletPoints, payload: {
       'driverID': box.read(BoxName.driverID).toString(),
       'paymentID': paymentID.toString(),
@@ -245,7 +245,8 @@ class CaptainWalletController extends GetxController {
       'payment_method': paymentMethod.toString(),
       'passengerID': paymentMethod,
     });
-    await addSeferWallet(paymentMethod, (double.parse(point) * -1).toString());
+    await addSeferWallet(paymentMethod,
+        (double.parse(point) * -2).toString()); // deduct 2 from sefer wallet
   }
 
   Future addSeferWallet(String paymentMethod, String point) async {
@@ -290,7 +291,7 @@ class CaptainWalletController extends GetxController {
       'paymentMethod': paymentMethod2.toString(),
     });
     if (res1 != 'failure') {
-      FirebaseMessagesController().sendNotificationToDriverMAP(
+      Get.find<FirebaseMessagesController>().sendNotificationToDriverMAP(
           'Transfer',
           '${'You have transfer to your wallet from'.tr}'
               '${box.read(BoxName.nameDriver)}',

lib/controller/home/payment/paymob_payout.dart

@@ -1,15 +1,12 @@
 import 'dart:convert';
 
 import 'package:local_auth/local_auth.dart';
-import 'package:sefer_driver/constant/api_key.dart';
 import 'package:sefer_driver/constant/box_name.dart';
 import 'package:sefer_driver/main.dart';
 import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 import 'package:get/get.dart';
 import 'package:http/http.dart' as http;
-import 'package:secure_string_operations/secure_string_operations.dart';
 
-import '../../../constant/char_map.dart';
 import '../../../constant/links.dart';
 import '../../../views/widgets/mydialoug.dart';
 import '../../functions/crud.dart';
@@ -19,39 +16,8 @@ class PaymobPayout extends GetxController {
   bool isLoading = false;
   String dropdownValue = 'etisalat';
 
-  Future<String> getToken() async {
-    var headers = {
-      'Content-Type': 'application/x-www-form-urlencoded',
-      // 'Cookie':
-      //     'csrftoken=74iZJ8XYyuTm5WRq2W4tpWX5eqoJLZVK5QhuDrChWpDtzpgGA269bbCWuEcW85t4'
-    };
-    var payMobOutClientSecrret =
-        X.r(X.r(X.r(await getAIKey(KN.pmobsec), cn), cC), cs);
-    var payMobOutClientId =
-        X.r(X.r(X.r(await getAIKey(KN.pmobid), cn), cC), cs);
-    var body = {
-      'grant_type': 'password',
-      'username': AK.payMobOutUserName,
-      'password': AK.payMobOutPassword,
-      'client_id': payMobOutClientId,
-      'client_secret': payMobOutClientSecrret
-    };
-    var res = await http.post(
-      Uri.parse('https://payouts.paymobsolutions.com/api/secure/o/token/'),
-      headers: headers,
-      body: body,
-    );
-    String token = '';
-    if (res.statusCode == 200) {
-      var decode = jsonDecode(res.body);
-      token = decode['access_token'];
-    }
-    return token;
-  }
-
   int payOutFee = 5;
-  payToDriverWallet(
-      String token, String amount, String issuer, String msisdn) async {
+  payToDriverWallet(String amount, String issuer, String msisdn) async {
     bool isAvailable = await LocalAuthentication().isDeviceSupported();
     if (isAvailable) {
       // Authenticate the user
@@ -62,21 +28,18 @@ class PaymobPayout extends GetxController {
             sensitiveTransaction: true,
           ));
       if (didAuthenticate) {
-        var headers = {
-          'Authorization': 'Bearer $token',
-          'Content-Type': 'application/json',
-        };
-        var body = json.encode({
-          "amount": amount, //"10.00",
-          "issuer": issuer, //"vodafone",
-          "msisdn": msisdn, // "01023456789"
-        });
-        var res = await http.post(
-          Uri.parse('https://payouts.paymobsolutions.com/api/secure/disburse/'),
-          headers: headers,
-          body: body,
-        );
-        var dec = jsonDecode(res.body);
+        var dec = await CRUD().postWallet(
+            link:
+                'wl.tripz-egypt.com/v1/main/ride/payMob/paymob_driver/paymob_payout.php',
+            payload: {
+              "issuer": issuer,
+              "method": "wallet",
+              "amount": amount, //9.0,
+              "full_name":
+                  '${box.read(BoxName.nameDriver)} ${box.read(BoxName.lastNameDriver)}',
+              "msisdn": msisdn, //"01010101010",
+              "bank_transaction_type": "cash_transfer"
+            });
         if (dec['disbursement_status'] == 'successful') {
           var paymentToken = await Get.find<CaptainWalletController>()
               .generateToken(
@@ -149,8 +112,8 @@ class PaymobPayout extends GetxController {
     } else {}
   }
 
-  payToDriverBankAccount(String token, String amount, String bankCardNumber,
-      String bankCode) async {
+  payToDriverBankAccount(
+      String amount, String bankCardNumber, String bankCode) async {
     bool isAvailable = await LocalAuthentication().isDeviceSupported();
     if (isAvailable) {
       // Authenticate the user
@@ -161,12 +124,9 @@ class PaymobPayout extends GetxController {
             sensitiveTransaction: true,
           ));
       if (didAuthenticate) {
-        var headers = {
-          'Authorization': 'Bearer $token',
-          'Content-Type': 'application/json',
-        };
         var body = {
           "issuer": "bank_card",
+          "method": "bank_card",
           "amount": amount, //9.0,
           "full_name":
               '${box.read(BoxName.nameDriver)} ${box.read(BoxName.lastNameDriver)}',
@@ -174,12 +134,11 @@ class PaymobPayout extends GetxController {
           "bank_code": bankCode, //"CIB",
           "bank_transaction_type": "cash_transfer"
         };
-        var res = await http.post(
-          Uri.parse('https://payouts.paymobsolutions.com/api/secure/disburse/'),
-          headers: headers,
-          body: body,
+        var dec = await CRUD().postWallet(
+          link:
+              'wl.tripz-egypt.com/v1/main/ride/payMob/paymob_driver/paymob_payout.php',
+          payload: body,
         );
-        var dec = jsonDecode(res.body);
         if (dec['disbursement_status'] == 'successful') {
           var paymentToken = await Get.find<CaptainWalletController>()
               .generateToken(
@@ -236,8 +195,7 @@ class PaymobPayout extends GetxController {
             sensitiveTransaction: true,
           ));
       if (didAuthenticate) {
-        String token = await getToken();
-        await payToDriverWallet(token, amount, issuer, msisdn);
+        await payToDriverWallet(amount, issuer, msisdn);
       } else {
         MyDialog().getDialog('Authentication failed'.tr, ''.tr, () {
           Get.back();
@@ -263,8 +221,7 @@ class PaymobPayout extends GetxController {
             sensitiveTransaction: true,
           ));
       if (didAuthenticate) {
-        String token = await getToken();
-        await payToDriverBankAccount(token, amount, bankCardNumber, bankCode);
+        await payToDriverBankAccount(amount, bankCardNumber, bankCode);
       } else {
         MyDialog().getDialog('Authentication failed'.tr, ''.tr, () {
           Get.back();