Haroon6138
/
car_provider_app
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Bug Fixes

Browse Source
master
FaizHashmi 2 weeks ago
parent 832c1569bb
commit 4e8ae4d0d1
8 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File

7
android/app/src/main/AndroidManifest.xml
Unescape Escape View File

@ -81,6 +81,13 @@
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" android:host="ms.hmg.com" /> <data android:scheme="https" android:host="ms.hmg.com" />
</intent-filter> </intent-filter>
<!-- Custom scheme fallback used by the ms.hmg.com/ad/{id} web page when App Links verification isn't active -->
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="mowaterprovider" />
</intent-filter>
</activity> </activity>

13
ios/Runner/Info.plist
Unescape Escape View File

@ -59,5 +59,18 @@
</array> </array>
<key>UIViewControllerBasedStatusBarAppearance</key> <key>UIViewControllerBasedStatusBarAppearance</key>
<false/> <false/>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLName</key>
<string>com.cloud.solutions.mowater.ksa.provider</string>
<key>CFBundleURLSchemes</key>
<array>
<string>mowaterprovider</string>
</array>
</dict>
</array>
</dict> </dict>
</plist> </plist>

18
lib/views/branch_management/branch/branch_detail_page.dart
Unescape Escape View File

@ -1,6 +1,4 @@
import 'dart:async'; import 'dart:async';
import 'dart:developer';
import 'package:car_provider_app/view_models/schedule_view_model.dart'; import 'package:car_provider_app/view_models/schedule_view_model.dart';
import 'package:car_provider_app/views/branch_management/branch/dealer/widget/assign_dealer_user_sheet.dart'; import 'package:car_provider_app/views/branch_management/branch/dealer/widget/assign_dealer_user_sheet.dart';
import 'package:car_provider_app/views/branch_management/services/services_list_page.dart'; import 'package:car_provider_app/views/branch_management/services/services_list_page.dart';
@ -25,7 +23,6 @@ import 'package:mc_common_app/widgets/button/show_fill_button.dart';
import 'package:mc_common_app/widgets/common_widgets/app_bar.dart'; import 'package:mc_common_app/widgets/common_widgets/app_bar.dart';
import 'package:mc_common_app/widgets/common_widgets/custom_add_button_widget.dart'; import 'package:mc_common_app/widgets/common_widgets/custom_add_button_widget.dart';
import 'package:mc_common_app/widgets/extensions/extensions_widget.dart'; import 'package:mc_common_app/widgets/extensions/extensions_widget.dart';
import 'package:mc_common_app/widgets/row_with_arrow.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class BranchDetailPage extends StatefulWidget { class BranchDetailPage extends StatefulWidget {
@ -215,7 +212,8 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
width: 13.0, width: 13.0,
color: Colors.black, color: Colors.black,
), ),
) ], )
],
) )
], ],
)), )),
@ -272,7 +270,8 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
), ),
Column( Column(
children: [ children: [
showData("${LocaleKeys.location.tr()}:", "${isArabic ? widget.branchData.cityNameN.toString() : widget.branchData.cityName.toString()}, ${isArabic ? widget.branchData.countryNameN.toString() : widget.branchData.countryName.toString()}"), showData("${LocaleKeys.location.tr()}:",
"${isArabic ? widget.branchData.cityNameN.toString() : widget.branchData.cityName.toString()}, ${isArabic ? widget.branchData.countryNameN.toString() : widget.branchData.countryName.toString()}"),
showData("${LocaleKeys.provider.tr()}:", widget.branchData.serviceProviderName.toString()), showData("${LocaleKeys.provider.tr()}:", widget.branchData.serviceProviderName.toString()),
showData("${LocaleKeys.time.tr()}:", "${widget.branchData.openTime.toString()} - ${widget.branchData.closeTime.toString()}"), showData("${LocaleKeys.time.tr()}:", "${widget.branchData.openTime.toString()} - ${widget.branchData.closeTime.toString()}"),
showData("${LocaleKeys.address.tr()}:", widget.branchData.address.toString()), showData("${LocaleKeys.address.tr()}:", widget.branchData.address.toString()),
@ -310,14 +309,7 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
), ),
) )
], ],
) ).margin(right: 5),
// .withArrow(
// isArrowEnabled: true,
// color: Colors.white,
// arrowWidth: 16.16,
// arrowHeight: 11.75,
// )
.margin(right: 5),
).onPress(() { ).onPress(() {
if (widget.branchData.branchStatus == BranchStatusEnum.pending || widget.branchData.branchStatus == BranchStatusEnum.rejected) { if (widget.branchData.branchStatus == BranchStatusEnum.pending || widget.branchData.branchStatus == BranchStatusEnum.rejected) {
Utils.showToast(LocaleKeys.waitForBranchVerification.tr()); Utils.showToast(LocaleKeys.waitForBranchVerification.tr());

10
lib/views/dashboard/widget/general_appointment_widget.dart
Unescape Escape View File

@ -175,9 +175,7 @@ class GeneralAppointmentWidget extends StatelessWidget {
4.width, 4.width,
// Expanded(child: appointmentListModel.appointmentDate!.toFormattedDateWithoutTime().toText(fontSize: 8)) // Expanded(child: appointmentListModel.appointmentDate!.toFormattedDateWithoutTime().toText(fontSize: 8))
Expanded( Expanded(
child: appointmentListModel.appointmentDate! child: appointmentListModel.appointmentDate!.toLocalizedFormattedDateWithoutTime(context).toText(fontSize: 8),
.toLocalizedFormattedDateWithoutTime(context)
.toText(fontSize: 8),
) )
], ],
), ),
@ -196,11 +194,9 @@ class GeneralAppointmentWidget extends StatelessWidget {
children: [ children: [
"${LocaleKeys.createdOn.tr()}: ".toText(color: MyColors.lightTextColor), "${LocaleKeys.createdOn.tr()}: ".toText(color: MyColors.lightTextColor),
2.width, 2.width,
// Expanded(child: appointmentListModel.appointmentCreatedOn!.toFormattedDateWithoutTime().toText(fontSize: 8)) // Expanded(child: appointmentListModel.appointmentCreatedOn!.toFormattedDateWithoutTime().toText(fontSize: 8))
Expanded( Expanded(
child: appointmentListModel.appointmentCreatedOn! child: appointmentListModel.appointmentCreatedOn!.toLocalizedFormattedDateWithoutTime(context).toText(fontSize: 8),
.toLocalizedFormattedDateWithoutTime(context)
.toText(fontSize: 8),
) )
], ],
), ),

2
lib/views/subscriptions/my_subscritions_page.dart
Unescape Escape View File

@ -143,5 +143,3 @@ class _MySubscriptionsPageState extends State<MySubscriptionsPage> {
); );
} }
} }

1
lib/views/subscriptions/sheet/upgrade_package_sheet.dart
Unescape Escape View File

@ -1,6 +1,5 @@
import 'dart:async'; import 'dart:async';
import 'dart:developer'; import 'dart:developer';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mc_common_app/classes/app_state.dart'; import 'package:mc_common_app/classes/app_state.dart';
import 'package:mc_common_app/config/routes.dart'; import 'package:mc_common_app/config/routes.dart';

2
lib/views/subscriptions/widget/all_subscriptions_card.dart
Unescape Escape View File

@ -93,7 +93,7 @@ class AllSubscriptionsCard extends StatelessWidget {
], ],
), ),
), ),
if (subscription.subscriptionTypeEnum == SubscriptionTypeEnum.current && subscription.isRenewable!) if (subscription.subscriptionTypeEnum == SubscriptionTypeEnum.current && subscription.isRenewable! && DateHelper.isWithinDays(subscription.dateEnd, 7))
Row( Row(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,

2
lib/views/subscriptions/widget/my_subscriptions_card.dart
Unescape Escape View File

@ -105,7 +105,7 @@ class MySubscriptionsCard extends StatelessWidget {
"${subscriptionVM.isExpired! ? LocaleKeys.expired.tr() : LocaleKeys.expiresOn.tr()} ${DateFormat('d MMMM yyyy', context.locale.toString()).format(DateHelper.parseStringToDate(DateHelper.formatDateT(subscriptionVM.dateEnd ?? "")))}" "${subscriptionVM.isExpired! ? LocaleKeys.expired.tr() : LocaleKeys.expiresOn.tr()} ${DateFormat('d MMMM yyyy', context.locale.toString()).format(DateHelper.parseStringToDate(DateHelper.formatDateT(subscriptionVM.dateEnd ?? "")))}"
.toText(fontSize: 14, letterSpacing: -0.56, color: textColor, fontWeight: MyFonts.Medium), .toText(fontSize: 14, letterSpacing: -0.56, color: textColor, fontWeight: MyFonts.Medium),
// "${subscriptionVM.isExpired! ? LocaleKeys.expired.tr() : LocaleKeys.expiresOn.tr()} ${DateHelper.formatAsDayMonthYear(DateHelper.parseStringToDate(DateHelper.formatDateT(subscriptionVM.dateEnd ?? "")))}".toText(fontSize: 14, letterSpacing: -0.56, color: textColor, fontWeight: MyFonts.Medium), // "${subscriptionVM.isExpired! ? LocaleKeys.expired.tr() : LocaleKeys.expiresOn.tr()} ${DateHelper.formatAsDayMonthYear(DateHelper.parseStringToDate(DateHelper.formatDateT(subscriptionVM.dateEnd ?? "")))}".toText(fontSize: 14, letterSpacing: -0.56, color: textColor, fontWeight: MyFonts.Medium),
if (subscriptionVM.isRenewable!) if (subscriptionVM.isRenewable! && DateHelper.isWithinDays(subscriptionVM.dateEnd, 7))
Row( Row(
children: [ children: [
6.width, 6.width,

Write Preview
Loading…
Cancel
Save