Merge branch 'aamir_dev' into faiz_development_common

# Conflicts:
#	lib/views/advertisement/bottom_sheets/ad_duration_selection_sheet.dart

lib/views/advertisement/bottom_sheets/ad_duration_selection_sheet.dart

@@ -169,7 +169,7 @@ class AdDurationSelectionSheet extends StatelessWidget {
               if (adVM.isFetchingLists) {
                 return;
               } else {
-                if (isFromExtendAd && !isUpdateAdSelected) {
+                if (isFromExtendAd && !isUpdateAdSelected && AppState().currentAppType == AppType.provider) {
                   final subscriptionsVM = context.read<SubscriptionsVM>();
                   List<bool> statuses =
                       await adVM.createAdExtensionOrder(context, adId: adsID, adsDurationId: adVM.vehicleAdDurationId.selectedId); // [0] Means API response [1] means isPaymentRequired

lib/views/setting_options/provider_license_page.dart

@@ -10,6 +10,7 @@ import 'package:mc_common_app/generated/locale_keys.g.dart';
 import 'package:mc_common_app/models/general_models/generic_resp_model.dart';
 import 'package:mc_common_app/models/provider_branches_models/profile/document.dart';
 import 'package:mc_common_app/theme/colors.dart';
+import 'package:mc_common_app/utils/date_helper.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';
@@ -201,9 +202,10 @@ class _ProviderLicensePageState extends State<ProviderLicensePage> {
 
                 hint: LocaleKeys.expiryDate.tr(),
                 value: document.dateExpire != null && document.status == DocumentStatusEnum.pending || document.status == DocumentStatusEnum.approvedOrActive ? "${DateFormat('yyyy-MM-dd').format(
-                    DateTime.parse(document.dateExpire!))}" : formattedDate == null
+                    DateTime.parse(formatDate(document.dateExpire!)))}" : formattedDate == null
                     ? ""
-                    : "${DateFormat('yyyy-MM-dd').format(DateTime.parse(document.dateExpire!))}",
+
+               : "${formatDate(document.dateExpire!)}",
                 isNeedClickAll: true,
                 postFixDataColor: MyColors.darkTextColor,
                 onTap: () async {
@@ -218,6 +220,7 @@ class _ProviderLicensePageState extends State<ProviderLicensePage> {
                         .now()
                         .day), firstDate: DateTime.now());
                     if (formattedDate!.isNotEmpty) {
+                      print(formattedDate);
                       document.dateExpire = formattedDate;
                       setState(() {});
                     }
@@ -367,3 +370,17 @@ Color getColorByStatus(DocumentStatusEnum docStatus) {
       return MyColors.adPendingStatusColor;
   }
 }
+
+
+String formatDate(String dateString) {
+  List<String> parts = dateString.split('-');
+  if (parts[1].length == 1) {
+    parts[1] = '0${parts[1]}';
+  }
+  if (parts[2].length == 1) {
+    parts[2] = '0${parts[2]}';
+  }
+  String formattedDateString = parts.join('-');
+  DateTime dateTime = DateTime.parse(formattedDateString);
+  return DateFormat('yyyy-MM-dd').format(dateTime);
+}