Localization

lib/views/settings/branch/branch_list_page.dart

@@ -47,6 +47,7 @@ class BranchListPage extends StatelessWidget {
               onBackButtonTapped: onBackButtonTapped,
             ),
       floatingActionButton: FloatingActionButton(
+        backgroundColor: MyColors.darkPrimaryColor,
         child: const Icon(
           Icons.add,
           color: Colors.white,

lib/views/subscriptions/my_subscritions_page.dart

@@ -1,3 +1,5 @@
+import 'dart:developer';
+
 import 'package:car_provider_app/config/provider_routes.dart';
 import 'package:car_provider_app/views/subscriptions/sheet/select_package_sheet.dart';
 import 'package:car_provider_app/views/subscriptions/widget/subscriptions_card.dart';
@@ -6,9 +8,11 @@ import 'package:mc_common_app/classes/app_state.dart';
 import 'package:mc_common_app/config/routes.dart';
 import 'package:mc_common_app/extensions/int_extensions.dart';
 import 'package:mc_common_app/generated/locale_keys.g.dart';
+import 'package:mc_common_app/models/general_models/m_response.dart';
 import 'package:mc_common_app/theme/colors.dart';
 import 'package:mc_common_app/utils/enums.dart';
 import 'package:mc_common_app/utils/navigator.dart';
+import 'package:mc_common_app/utils/utils.dart';
 import 'package:mc_common_app/view_models/payment_view_model.dart';
 import 'package:mc_common_app/view_models/subscriptions_view_model.dart';
 import 'package:mc_common_app/widgets/bottom_sheet.dart';
@@ -23,8 +27,7 @@ class MySubscriptionsPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    context.read<SubscriptionsVM>().getMySubscriptions(
-        AppState().getUser.data?.userInfo?.providerId.toString() ?? "");
+    context.read<SubscriptionsVM>().getMySubscriptions(AppState().getUser.data?.userInfo?.providerId.toString() ?? "");
     return Scaffold(
       appBar: const CustomAppBar(
         title: "My Subscriptions",
@@ -46,32 +49,34 @@ class MySubscriptionsPage extends StatelessWidget {
                               itemBuilder: (BuildContext context, int index) {
                                 return SubscriptionsCard(
                                   model.allSubscriptions.data![index],
-                                  isSubscribed: model.allSubscriptions
-                                          .data![index].isSubscribed ??
-                                      false,
+                                  isSubscribed: model.allSubscriptions.data![index].isSubscribed ?? false,
                                   backgroundColor: MyColors.darkIconColor,
-                                  onRenewSubscriptionClick: () {
-                                    context
-                                        .read<PaymentVM>()
-                                        .updateOrderProviderSubscriptionId(
-                                            id: model.allSubscriptions
-                                                    .data![index].id ??
-                                                0);
-                                    navigateWithName(
-                                      context,
-                                      AppRoutes.paymentMethodsView,
-                                      arguments: PaymentTypes.subscription,
+                                  onRenewSubscriptionClick: () async {
+                                    Utils.showLoading(context);
+                                    MResponse response = await model.createSubscriptionOrder(
+                                      model.allSubscriptions.data![index].id ?? 0,
+                                      true,
+                                      false,
+                                      model.allSubscriptions.data![index].price.toString(),
                                     );
+                                    Utils.hideLoading(context);
+                                    if (response.data != null) {
+                                      log("response.data: ${response.data}");
+                                      context.read<PaymentVM>().updateOrderProviderSubscriptionId(id: response.data ?? 0);
+                                      navigateWithName(
+                                        context,
+                                        AppRoutes.paymentMethodsView,
+                                        arguments: PaymentTypes.subscription,
+                                      );
+                                    }
                                   },
                                 ).onPress(
                                   () {
-                                    showMyBottomSheet(context,
-                                        child: const SelectPackageSheet());
+                                    showMyBottomSheet(context, child: const SelectPackageSheet());
                                   },
                                 );
                               },
-                              separatorBuilder:
-                                  (BuildContext context, int index) {
+                              separatorBuilder: (BuildContext context, int index) {
                                 return 21.height;
                               },
                               physics: const NeverScrollableScrollPhysics(),
@@ -97,6 +102,7 @@ class MySubscriptionsPage extends StatelessWidget {
           ],
         ),
       ),
+
     );
   }
 }