diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
index 6b4c0f78..cb6be309 100644
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -2,25 +2,25 @@
- CFBundleDevelopmentRegion
- $(DEVELOPMENT_LANGUAGE)
- CFBundleExecutable
- App
- CFBundleIdentifier
- io.flutter.flutter.app
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- App
- CFBundlePackageType
- FMWK
- CFBundleShortVersionString
- 1.0
- CFBundleSignature
- ????
- CFBundleVersion
- 1.0
- MinimumOSVersion
- 8.0
+ CFBundleDevelopmentRegion
+ $(DEVELOPMENT_LANGUAGE)
+ CFBundleExecutable
+ App
+ CFBundleIdentifier
+ io.flutter.flutter.app
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleName
+ App
+ CFBundlePackageType
+ FMWK
+ CFBundleShortVersionString
+ 1.0
+ CFBundleSignature
+ ????
+ CFBundleVersion
+ 1.0
+ MinimumOSVersion
+ 11.0
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 72bd4ac9..ec89ac71 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -15,50 +15,73 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- $(FLUTTER_BUILD_NAME)
+ $(MARKETING_VERSION)
CFBundleSignature
????
CFBundleVersion
$(FLUTTER_BUILD_NUMBER)
LSRequiresIPhoneOS
+ MinimumOSVersion
+ 11.0
+ NSAppTransportSecurity
+
+ NSAllowsArbitraryLoads
+
+ NSAllowsArbitraryLoadsForMedia
+
+ NSAllowsArbitraryLoadsInWebContent
+
+
+ NSAppleMusicUsageDescription
+ Required by another plugin, Please let us know if you find this functionality anywhere in the app.
+ NSBluetoothAlwaysUsageDescription
+ This App requires access to Bluetooth to connect blood pressure & blood sugar devices with the app to analyze the data.
+ NSBluetoothPeripheralUsageDescription
+ This App requires access to Bluetooth to connect blood pressure & blood sugar devices with the app to analyze the data.
NSCalendarsUsageDescription
- We need access to record you event in to calender.
+ This app requires calendar access to set reminders for Virtual & Normal Appointments.
NSCameraUsageDescription
- Need camera access for uploading images
+ This app requires camera access to enable virtual consultation between patient & doctor
+ NSContactsUsageDescription
+ This app requires contacts access to show incoming virtual consultation request.
+ NSFaceIDUsageDescription
+ This app requires Face ID to allow biometric authentication for app login.
+ NSHealthShareUsageDescription
+ This App need access to HealthKit to read heart rate & other data from your smart watch.
+ NSHealthUpdateUsageDescription
+ This App need access to HealthKit to read heart rate & other data from your smart watch.
NSLocationAlwaysAndWhenInUseUsageDescription
- This app will use your location to show cool stuffs near you.
+ This App requires access to your location to show the nearest hospitals & ER Locations from your location.
NSLocationAlwaysUsageDescription
- This app will use your location to show cool stuffs near you.
- NSLocationUsageDescription
- Need location access for updating nearby friends
+ This App requires access to your location to show the nearest hospitals from your location.
NSLocationWhenInUseUsageDescription
- This app will use your location to show cool stuffs near you.
+ This App requires access to your location to show the nearest hospitals from your location.
NSMicrophoneUsageDescription
- Need microphone access for uploading videos
+ This app requires microphone access to enable virtual consultation between patient & doctor
+ NSMotionUsageDescription
+ This app requires motion detection access to function properly.
NSPhotoLibraryUsageDescription
- Need photo library access for uploading images
+ This app requires photo library access to select image as document & upload it.
+ NSRemindersUsageDescription
+ This app requires calendar access to set reminders for Virtual & Normal Appointments.
+ NSSpeechRecognitionUsageDescription
+ This app requires speech recognition access to access voice command features.
+ NSUserActivityTypes
+
UIBackgroundModes
- fetch
+ audio
location
- processing
+ remote-notification
UILaunchStoryboardName
LaunchScreen
UIMainStoryboardFile
Main
- UIRequiredDeviceCapabilities
-
- location-services
- gps
- armv7
-
UISupportedInterfaceOrientations
UIInterfaceOrientationPortrait
- UIInterfaceOrientationLandscapeLeft
- UIInterfaceOrientationLandscapeRight
UISupportedInterfaceOrientations~ipad
diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index 1778603f..e13fdb9a 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -555,6 +555,7 @@ const Map localizedValues = {
"shipping": {"en": "Shipping", "ar": " الشحن"},
"shipBy": {"en": "SHIP BY:", "ar": "الشحن عن طريق:"},
"lakumPoints": {"en": "Lakum Points", "ar": "نقاط برنامج لكم"},
+ "useLakumPoints": {"en": "Use Lakum points", "ar": "استخدم برنامج لكم"},
"use": {"en": "USE", "ar": "استخدم"},
"proceedPay": {"en": "PROCEED TO PAY", "ar": "المتابعة للدفع"},
"vat": {"en": "VAT (15%)", "ar": "(15%) القيمة المضافة"},
@@ -821,7 +822,7 @@ const Map localizedValues = {
"body": {"en": "Body Mass", "ar": "كتلة\nالجسم"},
"body_string": {"en": "Body", "ar": "الجسم"},
"face": {"en": "Face", "ar": "وجه"},
- "retouch": {"en": "Retouch", "ar": "تنميق"},
+ "retouch": {"en": "Retouch", "ar": "روتوش"},
"bikini": {"en": "Bikini", "ar": "بيكيني"},
"totalMinutes": {"en": "Total Minutes", "ar": "إجمالي الدقائق"},
"feedback": {"en": "Feedback", "ar": "رأيك يهمنا"},
@@ -1354,7 +1355,7 @@ const Map localizedValues = {
"en": " This service allows you to activate your LAKUM account after registering completed.",
"ar": " تتيح لك هذه الخدمة تفعيل حساب برنامج الولاء لكم بعد اكتمال التسجيل. "
},
- "pointsToTransfer": {"en": "Point's to Transfer:", "ar": "النقاط المراد تحويلها:"},
+ "pointsToTransfer": {"en": "Points to Transfer:", "ar": "النقاط المراد تحويلها:"},
"enterBeneficiaryAccountNo": {"en": "Enter Beneficiary Account No.", "ar": "أدخل رقم حساب المستفيد"},
"confirm-prescription": {"en": "Are you sure !! you want to send this request", "ar": "تاكيد ارسال الطلب؟"},
"you-already-have-order": {"en": "You already have this order! do you want to view it?", "ar": "لديك هذا الطلب بالفعل! هل تريد مشاهدته؟"},
@@ -1730,4 +1731,7 @@ const Map localizedValues = {
"gr": {"en": "gr", "ar": "غرام"},
"gramsPerMeal": {"en": "Grams Per Meal", "ar": "عدد الجرامات لكل وجبة"},
"syncSuccess": {"en": "Data Synced Successfully", "ar": "تمت مزامنة البيانات بنجاح"},
+ "points": {"en": "Points", "ar": "نقاط"},
+ "availableBalance": {"en": "Available Balance", "ar": "الرصيد المتوفر"},
+ "ordersDashboard": {"en": "My Orders", "ar": "طلباتي"},
};
diff --git a/lib/pages/medical/prescriptions/prescription_details_page.dart b/lib/pages/medical/prescriptions/prescription_details_page.dart
index 479f37c0..3a5b124b 100644
--- a/lib/pages/medical/prescriptions/prescription_details_page.dart
+++ b/lib/pages/medical/prescriptions/prescription_details_page.dart
@@ -296,21 +296,20 @@ class _PrescriptionDetailsPageState extends State {
setCalender(BuildContext context, String eventId, int reminderIndex) async {
CalendarUtils calendarUtils = await CalendarUtils.getInstance();
- DateTime startDate = DateUtil.convertStringToDate(widget.prescriptionReport.startDate);
- DateTime actualDate = DateTime(startDate.year, startDate.month, startDate.day, 8, 0); //Time will start at 8:00 AM from starting date
+ DateTime actualDate = DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day, 8, 0); //Time will start at 8:00 AM from starting date
if (widget.prescriptionReport?.frequencyNumber == null) widget.prescriptionReport.frequencyNumber = 1; //Some time frequency number is null so by default will be 2
+ int remainingDays = widget.prescriptionReport.days - (Jiffy(DateTime.now()).diff(DateUtil.convertStringToDate(widget.prescriptionReport.orderDate), Units.DAY));
+
GifLoaderDialogUtils.showMyDialog(context);
- for (int i = 0; i < widget.prescriptionReport.days; i++) {
+ for (int i = 0; i < remainingDays; i++) {
//event for number of days.
for (int j = 0; j < widget.prescriptionReport.frequencyNumber ?? 1; j++) {
// event for number of times per day.
-
if (j != 0) {
actualDate.add(new Duration(hours: 8)); // 8 hours addition for daily dose.
}
-
//Time subtraction from actual reminder time. like before 30, or 1 hour.
if (reminderIndex == 0) {
// Before 30 mints
diff --git a/lib/pages/medical/prescriptions/prescription_items_page.dart b/lib/pages/medical/prescriptions/prescription_items_page.dart
index 0e627a95..a9be08d2 100644
--- a/lib/pages/medical/prescriptions/prescription_items_page.dart
+++ b/lib/pages/medical/prescriptions/prescription_items_page.dart
@@ -243,6 +243,8 @@ class PrescriptionItemsPage extends StatelessWidget {
doseDailyQuantity: model.prescriptionReportEnhList[index].doseDailyQuantity,
days: model.prescriptionReportEnhList[index].days,
itemID: model.prescriptionReportEnhList[index].itemID,
+ orderDate: model.prescriptionReportEnhList[index].orderDate,
+ startDate: model.prescriptionReportEnhList[index].startDate,
remarks: model.prescriptionReportEnhList[index].remarks);
Navigator.push(
context,
diff --git a/lib/pages/pharmacies/screens/cart-page/cart-order-page.dart b/lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
index ce7b5f94..df44c706 100644
--- a/lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
+++ b/lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
@@ -1,15 +1,18 @@
+import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/OrderPreviewViewModel.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/pharmacy-terms-conditions-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/widgets/ProductOrderItem.dart';
+import 'package:diplomaticquarterapp/pages/pharmacy/order/Order.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:diplomaticquarterapp/widgets/buttons/GestureIconButton.dart';
+import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart';
@@ -28,10 +31,13 @@ class CartOrderPage extends StatefulWidget {
class _CartOrderPageState extends State {
bool isLoading = true;
+ String customerId;
+ String customerGUID;
@override
void initState() {
super.initState();
+ getCustomer();
getData();
}
@@ -224,10 +230,19 @@ class _CartOrderPageState extends State {
padding: const EdgeInsets.all(8.0),
child: Text(
TranslationBase.of(context).noData,
-// 'There is no data',
style: TextStyle(fontSize: 30),
),
- )
+ ),
+ Padding(
+ padding: const EdgeInsets.fromLTRB(60.0, 8.0, 60.0, 0.0),
+ child: DefaultButton(
+ TranslationBase.of(context).ordersDashboard,
+ () {
+ Navigator.push(context, FadePage(page: OrderPage(customerID: customerId, customerGUID: customerGUID)));
+ },
+ color: Colors.green,
+ ),
+ ),
],
),
),
@@ -240,6 +255,20 @@ class _CartOrderPageState extends State {
);
}
+ getCustomer() async {
+ String custID;
+ String custGUID;
+ custID = await sharedPref.getString(PHARMACY_CUSTOMER_ID);
+ custGUID = await sharedPref.getObject(PHARMACY_CUSTOMER_GUID);
+ setState(() {
+ customerId = custID;
+ customerGUID = custGUID;
+ });
+ print("customer Id is" + customerId);
+ print("customer GUID is" + customerGUID);
+ return customerId;
+ }
+
void getData() async {
await Provider.of(context, listen: false).getShoppingCart();
setState(() {
diff --git a/lib/pages/pharmacies/screens/cart-page/lakum_widget.dart b/lib/pages/pharmacies/screens/cart-page/lakum_widget.dart
index 89db5d89..5d48fe1f 100644
--- a/lib/pages/pharmacies/screens/cart-page/lakum_widget.dart
+++ b/lib/pages/pharmacies/screens/cart-page/lakum_widget.dart
@@ -1,5 +1,6 @@
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/OrderPreviewViewModel.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
+import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:flutter/material.dart';
@@ -16,6 +17,7 @@ class LakumWidget extends StatefulWidget {
class _LakumWidgetState extends State {
TextEditingController _pointsController = new TextEditingController();
+ bool useLakumWidgets = false;
@override
Widget build(BuildContext context) {
@@ -27,29 +29,30 @@ class _LakumWidgetState extends State {
padding: EdgeInsets.symmetric(vertical: 12, horizontal: 12),
child: Row(
children: [
- Image.asset(
- "assets/images/pharmacy_module/lakum/lakum_checkout.png",
- width: 30.0,
- fit: BoxFit.scaleDown,
- ),
- Container(
- decoration: BoxDecoration(color: Color(0x99ffffff)),
- padding: const EdgeInsets.symmetric(horizontal: 8),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Texts(
- "${TranslationBase.of(context).lakumPoints}",
- fontSize: 12,
- fontWeight: FontWeight.bold,
- ),
- Texts(
- "${widget.model.paymentCheckoutData.lacumInformation.lakumInquiryInformationObjVersion.pointsBalanceAmount}",
- fontSize: 12,
- fontWeight: FontWeight.normal,
+ Row(
+ children: [
+ SizedBox(
+ height: 24.0,
+ width: 24.0,
+ child: Checkbox(
+ activeColor: CustomColors.green,
+ value: useLakumWidgets,
+ onChanged: (bool value) {
+ setState(() {
+ useLakumWidgets = value;
+ print(useLakumWidgets);
+ });
+ },
),
- ],
- ),
+ ),
+ Padding(
+ padding: const EdgeInsets.only(left: 8.0, right: 8.0),
+ child: Text(
+ TranslationBase.of(context).useLakumPoints +
+ " (${widget.model.paymentCheckoutData.lacumInformation.lakumInquiryInformationObjVersion.pointsBalance.toString() + " " + TranslationBase.of(context).points})",
+ style: TextStyle(fontSize: 12.0, fontWeight: FontWeight.w600, letterSpacing: -0.56)),
+ ),
+ ],
),
Expanded(
child: Container(
@@ -58,71 +61,93 @@ class _LakumWidgetState extends State {
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
- Texts(
- "${TranslationBase.of(context).riyal}",
- fontSize: 12,
- fontWeight: FontWeight.bold,
- ),
Container(
- margin: projectProvider.isArabic ? EdgeInsets.only(right: 4) : EdgeInsets.only(left: 4),
- width: 60,
- height: 50,
- child: TextField(
- decoration: InputDecoration(
- border: OutlineInputBorder(
- borderSide: BorderSide(color: Colors.black, width: 0.2),
- gapPadding: 0,
- borderRadius: projectProvider.isArabic
- ? BorderRadius.only(topRight: Radius.circular(8), bottomRight: Radius.circular(8))
- : BorderRadius.only(topLeft: Radius.circular(8), bottomLeft: Radius.circular(8)),
+ decoration: BoxDecoration(color: Color(0x99ffffff)),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Texts(
+ "${TranslationBase.of(context).availableBalance}",
+ fontSize: 12,
+ fontWeight: FontWeight.bold,
),
- disabledBorder: OutlineInputBorder(
- borderSide: BorderSide(color: Colors.black, width: 0.4),
- gapPadding: 0,
- borderRadius: BorderRadius.only(topLeft: Radius.circular(8), bottomLeft: Radius.circular(8)),
+ Text(
+ "${TranslationBase.of(context).sar + " " + widget.model.paymentCheckoutData.lacumInformation.lakumInquiryInformationObjVersion.pointsBalanceAmount.toString()}",
+ style: TextStyle(fontSize: 12.0, fontWeight: FontWeight.w600, letterSpacing: -0.56)
),
- ),
- controller: _pointsController,
- keyboardType: TextInputType.number,
- style: TextStyle(
- fontSize: 14,
- color: widget.model.paymentCheckoutData.lacumInformation.lakumInquiryInformationObjVersion.pointsBalanceAmount > 0 ? Colors.black : Colors.grey,
- ),
- enabled: widget.model.paymentCheckoutData.lacumInformation.lakumInquiryInformationObjVersion.pointsBalanceAmount == 0 ? false : true,
- onChanged: (val) {
- var value = int.tryParse(val);
- if (value != null && value <= widget.model.paymentCheckoutData.lacumInformation.lakumInquiryInformationObjVersion.pointsBalanceAmount) {
- widget.model.paymentCheckoutData.usedLakumPoints = value;
- } else {
- widget.model.paymentCheckoutData.usedLakumPoints = 0;
- }
- _pointsController.text = "${widget.model.paymentCheckoutData.usedLakumPoints}";
- },
- ),
- ),
- Container(
- height: 50,
- padding: EdgeInsets.symmetric(horizontal: 8, vertical: 12),
- decoration: new BoxDecoration(
- color: Color(0xff3666E0),
- shape: BoxShape.rectangle,
- borderRadius: projectProvider.isArabic
- ? BorderRadius.only(topLeft: Radius.circular(6), bottomLeft: Radius.circular(6))
- : BorderRadius.only(topRight: Radius.circular(6), bottomRight: Radius.circular(6)),
- border: Border.fromBorderSide(BorderSide(
- color: Color(0xff3666E0),
- width: 0.8,
- )),
- ),
- child: Texts(
- "${TranslationBase.of(context).use}",
- fontSize: 12,
- color: Colors.white,
- fontWeight: FontWeight.bold,
+ ],
),
),
],
),
+ // child: Row(
+ // mainAxisAlignment: MainAxisAlignment.end,
+ // children: [
+ // Texts(
+ // "${TranslationBase.of(context).riyal}",
+ // fontSize: 12,
+ // fontWeight: FontWeight.bold,
+ // ),
+ // Container(
+ // margin: projectProvider.isArabic ? EdgeInsets.only(right: 4) : EdgeInsets.only(left: 4),
+ // width: 60,
+ // height: 50,
+ // child: TextField(
+ // decoration: InputDecoration(
+ // border: OutlineInputBorder(
+ // borderSide: BorderSide(color: Colors.black, width: 0.2),
+ // gapPadding: 0,
+ // borderRadius: projectProvider.isArabic
+ // ? BorderRadius.only(topRight: Radius.circular(8), bottomRight: Radius.circular(8))
+ // : BorderRadius.only(topLeft: Radius.circular(8), bottomLeft: Radius.circular(8)),
+ // ),
+ // disabledBorder: OutlineInputBorder(
+ // borderSide: BorderSide(color: Colors.black, width: 0.4),
+ // gapPadding: 0,
+ // borderRadius: BorderRadius.only(topLeft: Radius.circular(8), bottomLeft: Radius.circular(8)),
+ // ),
+ // ),
+ // controller: _pointsController,
+ // keyboardType: TextInputType.number,
+ // style: TextStyle(
+ // fontSize: 14,
+ // color: widget.model.paymentCheckoutData.lacumInformation.lakumInquiryInformationObjVersion.pointsBalanceAmount > 0 ? Colors.black : Colors.grey,
+ // ),
+ // enabled: widget.model.paymentCheckoutData.lacumInformation.lakumInquiryInformationObjVersion.pointsBalanceAmount == 0 ? false : true,
+ // onChanged: (val) {
+ // var value = int.tryParse(val);
+ // if (value != null && value <= widget.model.paymentCheckoutData.lacumInformation.lakumInquiryInformationObjVersion.pointsBalanceAmount) {
+ // widget.model.paymentCheckoutData.usedLakumPoints = value;
+ // } else {
+ // widget.model.paymentCheckoutData.usedLakumPoints = 0;
+ // }
+ // _pointsController.text = "${widget.model.paymentCheckoutData.usedLakumPoints}";
+ // },
+ // ),
+ // ),
+ // Container(
+ // height: 50,
+ // padding: EdgeInsets.symmetric(horizontal: 8, vertical: 12),
+ // decoration: new BoxDecoration(
+ // color: Color(0xff3666E0),
+ // shape: BoxShape.rectangle,
+ // borderRadius: projectProvider.isArabic
+ // ? BorderRadius.only(topLeft: Radius.circular(6), bottomLeft: Radius.circular(6))
+ // : BorderRadius.only(topRight: Radius.circular(6), bottomRight: Radius.circular(6)),
+ // border: Border.fromBorderSide(BorderSide(
+ // color: Color(0xff3666E0),
+ // width: 0.8,
+ // )),
+ // ),
+ // child: Texts(
+ // "${TranslationBase.of(context).use}",
+ // fontSize: 12,
+ // color: Colors.white,
+ // fontWeight: FontWeight.bold,
+ // ),
+ // ),
+ // ],
+ // ),
),
),
],
diff --git a/lib/pages/pharmacies/screens/lakum-main-page.dart b/lib/pages/pharmacies/screens/lakum-main-page.dart
index 4e50cecc..bac0ecc2 100644
--- a/lib/pages/pharmacies/screens/lakum-main-page.dart
+++ b/lib/pages/pharmacies/screens/lakum-main-page.dart
@@ -402,7 +402,7 @@ class LacumPointsWidget extends StatelessWidget {
},
child: Container(
width: mediaQuery.size.width / 2 - 25,
- padding: EdgeInsets.only(top: 12, left: 8, right: 8, bottom: 2),
+ padding: EdgeInsets.only(top: 12, left: 8, right: 8, bottom: 8),
decoration: BoxDecoration(
shape: BoxShape.rectangle,
borderRadius: BorderRadius.circular(8),
@@ -410,13 +410,13 @@ class LacumPointsWidget extends StatelessWidget {
color: Color(0xffe1e1e1),
width: 0.4,
)),
- color: pointType == 1 ? Color(0xff004bcc) : Color(0xffefefef),
+ color: pointType == 1 ? Colors.green : Color(0xffefefef),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
- Expanded(
+ Container(
+ margin: EdgeInsets.only(bottom: 10.0),
child: Column(
children: [
Row(
@@ -442,15 +442,15 @@ class LacumPointsWidget extends StatelessWidget {
),
Expanded(
child: Row(
+ mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
if (pointType != 4)
Expanded(
child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
+ // crossAxisAlignment: CrossAxisAlignment.start,
children: [
Texts(
- TranslationBase.of(context).RIYAL,
-// "RIYAL",
+ TranslationBase.of(context).sar,
fontSize: 13,
fontWeight: FontWeight.bold,
color: pointType == 1 ? Colors.white : Colors.black,
@@ -478,11 +478,10 @@ class LacumPointsWidget extends StatelessWidget {
child: Container(
margin: EdgeInsets.only(left: 8, right: 8),
child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
+ // crossAxisAlignment: CrossAxisAlignment.start,
children: [
Texts(
- TranslationBase.of(context).point,
-// "POINT",
+ TranslationBase.of(context).points,
fontSize: 12,
fontWeight: FontWeight.bold,
color: pointType == 1 ? Colors.white : Colors.black,
diff --git a/lib/pages/pharmacy/order/Order.dart b/lib/pages/pharmacy/order/Order.dart
index 40725423..9eda1004 100644
--- a/lib/pages/pharmacy/order/Order.dart
+++ b/lib/pages/pharmacy/order/Order.dart
@@ -859,6 +859,7 @@ class _OrderPageState extends State with SingleTickerProviderStateMix
pendingOrderList.add(model.orders[i]);
}
}
+ _tabController.animateTo(2);
return Container(
child: pendingOrderList.length != 0
? SingleChildScrollView(
diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart
index 0ce07ec4..3712c0ad 100644
--- a/lib/uitl/translations_delegate_base.dart
+++ b/lib/uitl/translations_delegate_base.dart
@@ -2793,6 +2793,10 @@ class TranslationBase {
String get reminderCancelSuccess => localizedValues["reminderCancelSuccess"][locale.languageCode];
String get syncSuccess => localizedValues["syncSuccess"][locale.languageCode];
+ String get useLakumPoints => localizedValues["useLakumPoints"][locale.languageCode];
+ String get points => localizedValues["points"][locale.languageCode];
+ String get availableBalance => localizedValues["availableBalance"][locale.languageCode];
+ String get ordersDashboard => localizedValues["ordersDashboard"][locale.languageCode];
}
class TranslationBaseDelegate extends LocalizationsDelegate {