Merge remote-tracking branch 'origin/faiz_dev' into faiz_development

lib/views/branch_management/branch/branch_detail_page.dart

@@ -60,7 +60,9 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
 
   bool validation(BuildContext context) {
     bool isValid = false;
-    for (var element in context.read<ServiceVM>().allProviderDealersList) {
+    for (var element in context
+        .read<ServiceVM>()
+        .allProviderDealersList) {
       if (element.isBranchUser ?? false) {
         isValid = true;
       }
@@ -112,6 +114,7 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
         onPressed: () async {
           showMyBottomSheet(
             context,
+            isScrollControlled: true,
             child: AssignDealerUserSheet(
               branchId: widget.branchData.id.toString(),
               callBackFunc: () {
@@ -188,7 +191,10 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
                       child: ListView.builder(
                         itemBuilder: (context, index) {
                           return Container(
-                        child: (EasyLocalization.of(context)?.currentLocale?.countryCode == "SA"
+                            child: (EasyLocalization
+                                .of(context)
+                                ?.currentLocale
+                                ?.countryCode == "SA"
                                 ? serviceVM.categories[pIndex].services![index].serviceDescriptionN.toString()
                                 : serviceVM.categories[pIndex].services![index].serviceDescription.toString())
                                 .toText(
@@ -301,7 +307,9 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
                             Utils.showToast(LocaleKeys.waitForBranchVerification.tr());
                             return;
                           }
-                          context.read<ScheduleVM>().currentSelectedBranchName = widget.branchData.branchName.toString();
+                          context
+                              .read<ScheduleVM>()
+                              .currentSelectedBranchName = widget.branchData.branchName.toString();
                           navigateWithName(context, AppRoutes.schedulesList, arguments: widget.branchData.id.toString());
                         }),
                         10.height,
@@ -332,7 +340,7 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
                             )).horPaddingMain(),
                         // Row(
                         //   crossAxisAlignment: CrossAxisAlignment.center,
-                        //   mainAxisAlignment: MainAxisAlignment.center,
+                        //   mainAxisAlignment: MainAxisAlignment.center,Assign
                         //   children: [
                         //     const Icon(
                         //       Icons.add,
@@ -363,7 +371,8 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
                           const Center(
                             child: CircularProgressIndicator(),
                           ),
-                        ] else ...[
+                        ] else
+                          ...[
                             ListView.separated(
                               itemBuilder: (context, pIndex) {
                                 return buildServiceTileWidget(pIndex, serviceVM).onPress(() {

lib/views/branch_management/branch/define_branch_view.dart

@@ -179,6 +179,7 @@ class _DefineBranchViewState extends State<DefineBranchView> {
                                 onTap: () => serviceVM.pickMultipleImages(),
                                 text: LocaleKeys.attachImage.tr(),
                                 icon: MyAssets.attachmentIcon.buildSvg(),
+                                extensions: GlobalConsts.allowedFileExtensions,
                               ),
                             ],
                             if (serviceVM.branchImageError != "") ...[

lib/views/branch_management/schedule/add_schedules_page.dart

@@ -184,10 +184,13 @@ class _AddSchedulesPageState extends State<AddSchedulesPage> {
                               initial: tomorrowDate,
                               firstDate: DateTime.now(),
                             );
+                            if (scheduleID != null) {
+                              endDate = "";
+                            }
 
                             if (endDate.isNotEmpty) {
-                              DateTime sDate = DateTime.parse(startDate);
-                              DateTime eDate = DateTime.parse(endDate);
+                              DateTime sDate = DateHelper.parseStringToDate(startDate);
+                              DateTime eDate = DateHelper.parseStringToDate(endDate);
 
                               if (sDate.isAfter(eDate)) {
                                 startDate = "";
@@ -215,18 +218,24 @@ class _AddSchedulesPageState extends State<AddSchedulesPage> {
                               Utils.showToast(LocaleKeys.pleaseEnterStartDateFirst.tr());
                               return;
                             } else {
-                              sDate = DateTime.parse(startDate);
+                              //  sDate = DateTime.parse(startDate);
+                              sDate = DateHelper.parseStringToDate(startDate);
 
                               firstDate = sDate.add(const Duration(days: 1)).subtract(
                                     Duration(hours: DateTime.now().hour, minutes: DateTime.now().minute, seconds: DateTime.now().second, microseconds: DateTime.now().microsecond),
                                   );
                             }
+
+                            if (startDate != null && startDate.isNotEmpty) {
+                              tomorrowDate = firstDate;
+                            }
+                            //
                             endDate = await Utils.pickDateFromDatePicker(
                               context,
                               initial: tomorrowDate,
                               firstDate: firstDate ?? tomorrowDate,
                             );
-                            DateTime eDate = DateTime.parse(endDate);
+                            DateTime eDate = DateHelper.parseStringToDate(endDate);
 
                             if (!eDate.isAfter(sDate)) {
                               endDate = "";
@@ -259,6 +268,7 @@ class _AddSchedulesPageState extends State<AddSchedulesPage> {
                             Expanded(
                               child: TxtField(
                                 hint: LocaleKeys.shiftStartTime.tr(),
+                                maxLines: 1,
                                 postfixWidget: const Icon(
                                   Icons.access_time_filled_outlined,
                                   size: 16,
@@ -286,6 +296,7 @@ class _AddSchedulesPageState extends State<AddSchedulesPage> {
                             Expanded(
                               child: TxtField(
                                 hint: LocaleKeys.shiftEndTime.tr(),
+                                maxLines: 1,
                                 postfixWidget: const Icon(
                                   Icons.access_time_filled_outlined,
                                   size: 16,

lib/views/branch_management/services/create_item_page.dart

@@ -149,6 +149,7 @@ class _CreateItemPageState extends State<CreateItemPage> {
                         },
                         text: LocaleKeys.attachImage.tr(),
                         icon: MyAssets.attachmentIcon.buildSvg(),
+                        extensions: GlobalConsts.allowedFileExtensions,
                       )
                     ],
                     20.height,