diff --git a/lib/config/config.dart b/lib/config/config.dart index 4ce586a1..dd21498e 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -22,12 +22,12 @@ var PACKAGES_ORDER_HISTORY = '/api/orders/items'; var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; // var BASE_URL = 'http://10.50.100.198:2018/'; // var BASE_URL = 'https://uat.hmgwebservices.com/'; -var BASE_URL = 'https://hmgwebservices.com/'; +// var BASE_URL = 'https://hmgwebservices.com/'; // var BASE_URL = 'https://orash.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidamergeuat.cloudsolutions.com.sa/'; -// var BASE_URL = 'https://webservices.hmg.com/'; +var BASE_URL = 'https://webservices.hmg.com/'; // var BASE_URL = 'http://10.50.100.198:4422/'; diff --git a/lib/widgets/charts/show_chart.dart b/lib/widgets/charts/show_chart.dart index 3128734f..e07dfeee 100644 --- a/lib/widgets/charts/show_chart.dart +++ b/lib/widgets/charts/show_chart.dart @@ -111,6 +111,7 @@ class ShowChart extends StatelessWidget { bottomTitles: AxisTitles( sideTitles: SideTitles( showTitles: true, + getTitlesWidget: (value, title) { TextStyle style = TextStyle( color: Colors.black, @@ -119,37 +120,43 @@ class ShowChart extends StatelessWidget { if (isWeeklyOrMonthly) { return Text( - '${timeSeries![value.toInt()].time.day}/ ${timeSeries![value.toInt()].time.month}', + '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year.toString().substring(2)}', style: style, ); } else { if (timeSeries!.length < 15) { if (timeSeries!.length > value.toInt()) { return Text( - '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year}', + '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year.toString().substring(2)}', style: style, ); } else - return SizedBox(); + return Text( + '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year.toString().substring(2)}', + style: style, + ); } else { if (value.toInt() == 0) return Text( - '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year}', + '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year.toString().substring(2)}', style: style, ); if (value.toInt() == timeSeries!.length - 1) return Text( - '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year}', + '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year.toString().substring(2)}', style: style, ); if (xAxixs.contains(value.toInt())) { return Text( - '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year}', + '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year.toString().substring(2)}', style: style, ); } } - return SizedBox(); + return Text( + '${timeSeries![value.toInt()].time.month}/ ${timeSeries![value.toInt()].time.year.toString().substring(2)}', + style: style, + ); } }, diff --git a/lib/widgets/in_app_browser/InAppBrowser.dart b/lib/widgets/in_app_browser/InAppBrowser.dart index ee68f743..6f61ac8a 100644 --- a/lib/widgets/in_app_browser/InAppBrowser.dart +++ b/lib/widgets/in_app_browser/InAppBrowser.dart @@ -38,9 +38,9 @@ class MyInAppBrowser extends InAppBrowser { static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL LIVE // static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL UAT - // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT + static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT - static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE + // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE // static String SERVICE_URL = 'https://uat.hmgwebservices.com/payfortforvidaplus/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL UAT VIDA PLUS diff --git a/pubspec.yaml b/pubspec.yaml index 7456565c..0a88aa7d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -173,9 +173,9 @@ dependencies: auto_size_text: ^3.0.0 equatable: ^2.0.3 wave: ^0.2.0 - sms_otp_auto_verify: ^2.2.0 + sms_otp_auto_verify: ^2.1.0 # flutter_ios_voip_kit: ^0.1.0 - google_api_availability: ^5.0.0 + google_api_availability: ^4.0.0 open_filex: ^4.3.2 path_provider: ^2.0.8 amazon_payfort: ^1.1.3