diff --git a/android/app/build.gradle b/android/app/build.gradle index 0fb8084..d922c67 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -55,8 +55,8 @@ android { // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdkVersion 23 targetSdkVersion flutter.targetSdkVersion - versionCode 35 - versionName '1.5.35' + versionCode 36 + versionName '1.5.36' // manifestPlaceholders = [mapsApiKey: 'android/app/src/main/AndroidManifest.xml'] } diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 2bfc321..9e3ddb9 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -21,7 +21,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 35 + 36 CFBundleSignature ???? CFBundleURLTypes @@ -36,7 +36,7 @@ CFBundleVersion - 4.0.35 + 4.0.36 FirebaseAppDelegateProxyEnabled NO GMSApiKey diff --git a/lib/constant/links.dart b/lib/constant/links.dart index c7bed65..df70f6b 100644 --- a/lib/constant/links.dart +++ b/lib/constant/links.dart @@ -71,6 +71,8 @@ class AppLink { ////-----------------DriverPayment------------------ static String addDrivePayment = "$ride/payment/add.php"; + static String updatePaymetToPaid = "$ride/payment/updatePaymetToPaid.php"; + static String addSeferWallet = "$ride/seferWallet/add.php"; static String getSeferWallet = "$ride/seferWallet/get.php"; static String addDriverPaymentPoints = "$ride/driverPayment/add.php"; @@ -151,7 +153,8 @@ class AppLink { ////////////////emails ============// static String sendEmailToPassengerForTripDetails = "$ride/rides/emailToPassengerTripDetail.php"; - + static String sendEmailToDrivertransaction = + "https://api.sefer.live/sefer/Admin/sendEmailToDrivertransaction.php"; // =========================================== static String pathImage = "$server/upload/types/"; static String uploadImage = "$server/uploadImage.php"; diff --git a/lib/controller/auth/google_sign.dart b/lib/controller/auth/google_sign.dart index 8d618b9..a5cd1b9 100644 --- a/lib/controller/auth/google_sign.dart +++ b/lib/controller/auth/google_sign.dart @@ -2,6 +2,7 @@ import 'package:SEFER/constant/box_name.dart'; import 'package:SEFER/controller/auth/captin/login_captin_controller.dart'; import 'package:SEFER/main.dart'; import 'package:SEFER/views/auth/captin/cards/sms_signup.dart'; +import 'package:SEFER/views/home/on_boarding_page.dart'; import 'package:get/get.dart'; import 'package:google_sign_in/google_sign_in.dart'; diff --git a/lib/controller/functions/log_out.dart b/lib/controller/functions/log_out.dart index 71bac58..b13a267 100644 --- a/lib/controller/functions/log_out.dart +++ b/lib/controller/functions/log_out.dart @@ -1,5 +1,6 @@ import 'dart:io'; +import 'package:SEFER/views/home/on_boarding_page.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:SEFER/constant/box_name.dart'; diff --git a/lib/controller/home/payment/paymob_payout.dart b/lib/controller/home/payment/paymob_payout.dart index 8dcdddb..f669845 100644 --- a/lib/controller/home/payment/paymob_payout.dart +++ b/lib/controller/home/payment/paymob_payout.dart @@ -76,10 +76,19 @@ class PaymobPayout extends GetxController { }); await Get.find() .addSeferWallet('payout fee myself', payOutFee.toString()); + await updatePaymentToPaid(box.read(BoxName.driverID).toString()); + await sendEmail( + box.read(BoxName.driverID).toString(), + amount, + box.read(BoxName.phoneDriver).toString(), + box.read(BoxName.nameDriver).toString(), + 'Wallet', + box.read(BoxName.emailDriver).toString()); Get.snackbar('Transaction successful'.tr, '${'Transaction successful'.tr} ${dec['amount']}', backgroundColor: AppColor.greenColor); + Get.find().getCaptainWalletFromRide(); } else if (dec['disbursement_status'] == 'failed') { Get.snackbar('Transaction failed'.tr, 'Transaction failed'.tr, @@ -87,6 +96,24 @@ class PaymobPayout extends GetxController { } } + Future updatePaymentToPaid(String driverID) async { + await CRUD().post(link: AppLink.updatePaymetToPaid, payload: { + 'driverID': driverID.toString(), + }); + } + + Future sendEmail( + String driverId, amount, phone, name, bankCardNumber, email) async { + await CRUD().sendEmail(AppLink.sendEmailToDrivertransaction, { + "driverID": driverId, + "total_amount": amount, + "phone": phone, + "name_arabic": name, + "accountBank": bankCardNumber, + "email": email + }); + } + payToDriverBankAccount(String token, String amount, String bankCardNumber, String bankCode) async { var headers = { diff --git a/lib/controller/home/splash_screen_controlle.dart b/lib/controller/home/splash_screen_controlle.dart index 130e345..281b01c 100644 --- a/lib/controller/home/splash_screen_controlle.dart +++ b/lib/controller/home/splash_screen_controlle.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'package:SEFER/controller/auth/captin/login_captin_controller.dart'; +import 'package:SEFER/views/home/on_boarding_page.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/onbording_page.dart b/lib/onbording_page.dart index 70a4b8f..4e0e695 100644 --- a/lib/onbording_page.dart +++ b/lib/onbording_page.dart @@ -1,38 +1,10 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:SEFER/views/widgets/elevated_btn.dart'; import 'constant/colors.dart'; import 'controller/auth/onboarding_controller.dart'; import 'models/model/onboarding_model.dart'; -class OnBoardingPage extends StatelessWidget { - OnBoardingControllerImp onBoardingControllerImp = - Get.put(OnBoardingControllerImp()); - - OnBoardingPage({super.key}); - @override - Widget build(BuildContext context) { - return Scaffold( - backgroundColor: AppColor.secondaryColor, - body: SafeArea( - child: Column(mainAxisAlignment: MainAxisAlignment.center, children: [ - SizedBox( - height: Get.height * .7, - child: const CustomSliderOnBoarding(), - ), - const CustomDotControllerOnBoarding(), - // const Spacer(flex: 2), - const SizedBox(height: 20), - MyElevatedButton( - onPressed: () => onBoardingControllerImp.next(), - title: 'Next'.tr, - ) - ]), - )); - } -} - class CustomSliderOnBoarding extends GetView { const CustomSliderOnBoarding({Key? key}) : super(key: key); diff --git a/lib/views/home/on_boarding_page.dart b/lib/views/home/on_boarding_page.dart new file mode 100644 index 0000000..2e74ad0 --- /dev/null +++ b/lib/views/home/on_boarding_page.dart @@ -0,0 +1,33 @@ +import 'package:SEFER/constant/colors.dart'; +import 'package:SEFER/controller/auth/onboarding_controller.dart'; +import 'package:SEFER/onbording_page.dart'; +import 'package:SEFER/views/widgets/elevated_btn.dart'; +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; + +class OnBoardingPage extends StatelessWidget { + OnBoardingControllerImp onBoardingControllerImp = + Get.put(OnBoardingControllerImp()); + + OnBoardingPage({super.key}); + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: AppColor.secondaryColor, + body: SafeArea( + child: Column(mainAxisAlignment: MainAxisAlignment.center, children: [ + SizedBox( + height: Get.height * .7, + child: const CustomSliderOnBoarding(), + ), + const CustomDotControllerOnBoarding(), + // const Spacer(flex: 2), + const SizedBox(height: 20), + MyElevatedButton( + onPressed: () => onBoardingControllerImp.next(), + title: 'Next'.tr, + ) + ]), + )); + } +}