diff --git a/lib/config/config.dart b/lib/config/config.dart index 9e17af68..49b33063 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -19,12 +19,12 @@ const PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; const BASE_URL = 'https://hmgwebservices.com/'; // Pharmacy UAT URLs -// const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; -// const PHARMACY_BASE_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; + const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; + const PHARMACY_BASE_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; // // Pharmacy Production URLs -const BASE_PHARMACY_URL = 'https://mdlaboratories.com/exacartapi/api/'; -const PHARMACY_BASE_URL = 'https://mdlaboratories.com/exacartapi/api/'; +// const BASE_PHARMACY_URL = 'https://mdlaboratories.com/exacartapi/api/'; +// const PHARMACY_BASE_URL = 'https://mdlaboratories.com/exacartapi/api/'; const PING_SERVICE = 'Services/Weather.svc/REST/CheckConnectivity'; diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 72c06137..7823bf57 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -490,6 +490,8 @@ const Map localizedValues = { "noLocationAvailable": {"en": "No Location Available", "ar": "لا يوجد موقع"}, "orders": {"en": "Orders", "ar": "الطلبات"}, "lakum": {"en": "Lakum", "ar": "برنامج لكم"}, + "lakumMsg": {"en": "No Details of Points Are There", "ar": " لاتوجد تفاصيل عن النقاط"}, + "lakumPoint": {"en": "Point", "ar": "نقطه"}, "wishlist": {"en": "Wishlist", "ar": "المفضلة"}, "products": {"en": "Products", "ar": "المنتجات"}, "reviews": {"en": "Reviews", "ar": "التقيمات"}, @@ -585,6 +587,7 @@ const Map localizedValues = { "remeberthat": {"en": "Remember that", "ar": "تذكر ذلك:"}, "loginToUseService": {"en": "You need to login to use this service", "ar": "هذة الخدمة تتطلب تسجيل الدخول"}, "offersAndPromotions": {"en": "OFFERS & SPECIAL PROMOTIONS", "ar": "العروض والترقيات الخاصة"}, + "offers": {"en": "OFFERS", "ar": "العروض"}, "myPrescriptions": {"en": "MY PRESCRIPTIONS", "ar": "وصفاتي"}, "searchAndScanMedication": {"en": "SEARCH & SCAN FOR MEDICATION", "ar": "البحث والمسح للأدوية"}, "shopByBrands": {"en": "Shop by Brands", "ar": "تسوق حسب الماركات"}, @@ -605,10 +608,19 @@ const Map localizedValues = { "gained": {"en": "GAINED", "ar": "المكتسب"}, "consumed": {"en": "Consumed", "ar": "المستهلك"}, "transferred": {"en": "TRANSFERRED", "ar": "المحول"}, + "RIYAL": {"en": "RIYAL", "ar": "ريال"}, + "MEMBERSINCE": {"en": "MEMBER SINCE", "ar": "تاريخ العضوية"}, + "IDENTIFICATION": {"en": "IDENTIFICATION", "ar": "رقم الهوية"}, + "lakumMobile": {"en": "lakum Mobile", "ar": "رقم الجوال"}, + "Waitinggained": {"en": "Waiting gained", "ar": " بأنتظار التفعيل"}, + "Expired": {"en": "Expired", "ar": "منتهية الصلاحيه"}, + "WillBeExpired": {"en": "Will Be Expired", "ar": "ستنتهي صلاحيتها"}, + "LakumPoint": {"en": "Lakum Points", "ar": "نقاط لكم"}, + "ActivateLAKUMAccount": {"en": "Activate LAKUM Account", "ar": "تفعيل لكم"}, "checkBeneficiary": {"en": "CHECK BENEFICIARY", "ar": "تحقق من المستفيد"}, "beneficiaryName": {"en": "Beneficiary Name", "ar": "اسم المستفيد"}, "accountActivation": {"en": "Account Activation", "ar": "تفعيل الحساب"}, - "lakumTransfer": {"en": "Lakum Transfer", "ar": "تفعيل الحساب"}, + "lakumTransfer": {"en": "Lakum Transfer", "ar": "تحويل نقاط لكم"}, "acceptLbl": {"en": "Accept", "ar": "موافقة"}, "select-gender": {"en": "Select Gender", "ar": "اختر الجنس"}, "i-am-a": {"en": "I am a ...", "ar": "أنا ..."}, diff --git a/lib/core/service/parmacyModule/lacum-service.dart b/lib/core/service/parmacyModule/lacum-service.dart index c7117303..122bafd6 100644 --- a/lib/core/service/parmacyModule/lacum-service.dart +++ b/lib/core/service/parmacyModule/lacum-service.dart @@ -23,6 +23,8 @@ class LacumService extends BaseService{ await baseAppClient.post(GET_LACUM_ACCOUNT_INFORMATION, onSuccess: (response, statusCode) async { lacumInformation = LacumAccountInformation.fromJson(response); + print("Test Lacum Account Information"); + print(response); }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; @@ -45,6 +47,8 @@ class LacumService extends BaseService{ await baseAppClient.post(GET_LACUM_GROUP_INFORMATION, onSuccess: (response, statusCode) async { lacumGroupInformation = LacumAccountInformation.fromJson(response); + print("Test Lacum Group Information"); + print(response); }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; diff --git a/lib/pages/offers_categorise_page.dart b/lib/pages/offers_categorise_page.dart index 2715b2b0..15c3b070 100644 --- a/lib/pages/offers_categorise_page.dart +++ b/lib/pages/offers_categorise_page.dart @@ -33,7 +33,7 @@ class _OffersCategorisePageState extends State { builder: (BuildContext context, OffersCategoriseViewModel model, Widget child) => PharmacyAppScaffold( - appBarTitle: 'Offers', + appBarTitle: TranslationBase.of(context).offers, isShowAppBar: true, backgroundColor: Colors.white, isShowDecPage: false, diff --git a/lib/pages/pharmacies/product-brands.dart b/lib/pages/pharmacies/product-brands.dart index eed79869..7b6c6fd6 100644 --- a/lib/pages/pharmacies/product-brands.dart +++ b/lib/pages/pharmacies/product-brands.dart @@ -61,6 +61,17 @@ class _ProductBrandsPageState extends State { SizedBox( height: 10, ), + Container( + height: MediaQuery.of(context).size.height * 0.076, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(5.0), + color: Colors.white, + ), + child: topBrand(context), + ), + SizedBox( + height: 10, + ), Container( height: MediaQuery.of(context).size.height * 0.056, decoration: BoxDecoration( @@ -97,7 +108,7 @@ class _ProductBrandsPageState extends State { height: 10, ), Container( - height: 420, + height: 250, width: double.infinity, color: Colors.white, child: ListView.builder( diff --git a/lib/pages/pharmacies/screens/lacum-setting-page.dart b/lib/pages/pharmacies/screens/lacum-setting-page.dart index 4f7f5fd6..7c402402 100644 --- a/lib/pages/pharmacies/screens/lacum-setting-page.dart +++ b/lib/pages/pharmacies/screens/lacum-setting-page.dart @@ -112,8 +112,8 @@ class _LakumSettingPageState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Texts( - "Activate LAKUM Account", + Texts(TranslationBase.of(context).ActivateLAKUMAccount, +// "Activate LAKUM Account", fontSize: 16, fontWeight: FontWeight.normal, color: Colors.black, diff --git a/lib/pages/pharmacies/screens/lakum-main-page.dart b/lib/pages/pharmacies/screens/lakum-main-page.dart index ab8f367f..18981cc9 100644 --- a/lib/pages/pharmacies/screens/lakum-main-page.dart +++ b/lib/pages/pharmacies/screens/lakum-main-page.dart @@ -7,6 +7,7 @@ import 'package:diplomaticquarterapp/pages/pharmacies/screens/lacum-setting-page import 'package:diplomaticquarterapp/pages/pharmacies/screens/lacum-transfer-page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/lakum-points-year-page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/widgets/lacum-banner-widget.dart'; +import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; @@ -25,21 +26,11 @@ class LakumMainPage extends StatelessWidget { projectViewModel = Provider.of(context); return BaseView( - onModelReady: (model) async { - await model.getLacumData(); - if (model.lacumInformation.yahalaAccountNo == 0 || model.lacumInformation.yahalaAccountNo == null) { - navigateToLakumRegister(context); - } else { - if (model.lacumInformation.status == "Hold") { - Navigator.pushReplacement(context, FadePage(page: LakumActivationVidaPage())); - } - } - }, + onModelReady: (model) => model.getLacumData(), builder: (_, model, wi) => AppScaffold( appBarTitle: TranslationBase.of(context).lakum, isShowAppBar: true, isPharmacy: true, - showPharmacyCart: false, isShowDecPage: false, backgroundColor: Colors.white, baseViewModel: model, @@ -48,7 +39,10 @@ class LakumMainPage extends StatelessWidget { body: Container( width: double.infinity, child: SingleChildScrollView( - child: (model.lacumGroupInformation != null && model.lacumGroupInformation.lakumInquiryInformationObjVersion != null) + child: (model.lacumGroupInformation != null && + model.lacumGroupInformation + .lakumInquiryInformationObjVersion != + null) ? Column( children: [ Stack( @@ -59,31 +53,75 @@ class LakumMainPage extends StatelessWidget { ), Column( children: [ - Container(width: mediaQuery.size.width * 1, child: LakumBannerWidget(model, mediaQuery, true)), + SizedBox( + height: mediaQuery.size.height * 0.02, + ), + Container( + width: mediaQuery.size.width * 1, + child: LakumBannerWidget( + model, mediaQuery, true)), ], ) ], ), SizedBox( - height: 20, + width: 8, ), - LakumHomeButtons(mediaQuery, model), + LacumPointsWidget( + mediaQuery, + 2, + TranslationBase.of(context).gained, + model + .lacumGroupInformation + .lakumInquiryInformationObjVersion + .pointsBalanceAmount, + model.lacumGroupInformation + .lakumInquiryInformationObjVersion.gainedPoints, + model + .lacumGroupInformation + .lakumInquiryInformationObjVersion + .gainedPointsAmountPerYear), SizedBox( height: 20, ), Container( - height: 100, + height: 125, margin: EdgeInsets.symmetric(horizontal: 16), child: ListView( scrollDirection: Axis.horizontal, children: [ - LacumPointsWidget(mediaQuery, 1, TranslationBase.of(context).balance, model.lacumGroupInformation.lakumInquiryInformationObjVersion.pointsBalanceAmount, - model.lacumGroupInformation.lakumInquiryInformationObjVersion.pointsBalance, null), + LacumPointsWidget( + mediaQuery, + 1, + TranslationBase.of(context).balance, + model + .lacumGroupInformation + .lakumInquiryInformationObjVersion + .pointsBalanceAmount, + model + .lacumGroupInformation + .lakumInquiryInformationObjVersion + .pointsBalance, + null), SizedBox( width: 8, ), - LacumPointsWidget(mediaQuery, 2, TranslationBase.of(context).gained, model.lacumGroupInformation.lakumInquiryInformationObjVersion.pointsBalanceAmount, - model.lacumGroupInformation.lakumInquiryInformationObjVersion.gainedPoints, model.lacumGroupInformation.lakumInquiryInformationObjVersion.gainedPointsAmountPerYear), + LacumPointsWidget( + mediaQuery, + 2, + TranslationBase.of(context).gained, + model + .lacumGroupInformation + .lakumInquiryInformationObjVersion + .pointsBalanceAmount, + model + .lacumGroupInformation + .lakumInquiryInformationObjVersion + .gainedPoints, + model + .lacumGroupInformation + .lakumInquiryInformationObjVersion + .gainedPointsAmountPerYear), SizedBox( width: 8, ), @@ -91,21 +129,65 @@ class LakumMainPage extends StatelessWidget { mediaQuery, 3, TranslationBase.of(context).consumed, - model.lacumGroupInformation.lakumInquiryInformationObjVersion.consumedPointsAmount != null - ? int.parse(model.lacumGroupInformation.lakumInquiryInformationObjVersion.consumedPointsAmount) + model + .lacumGroupInformation + .lakumInquiryInformationObjVersion + .consumedPointsAmount != + null + ? int.parse(model + .lacumGroupInformation + .lakumInquiryInformationObjVersion + .consumedPointsAmount) : 0, - model.lacumGroupInformation.lakumInquiryInformationObjVersion.consumedPoints, - model.lacumGroupInformation.lakumInquiryInformationObjVersion.consumedPointsAmountPerYear), + model + .lacumGroupInformation + .lakumInquiryInformationObjVersion + .consumedPoints, + model + .lacumGroupInformation + .lakumInquiryInformationObjVersion + .consumedPointsAmountPerYear), SizedBox( width: 8, ), - LacumPointsWidget(mediaQuery, 4, TranslationBase.of(context).transferred, 0, model.lacumGroupInformation.lakumInquiryInformationObjVersion.transferPoints, - model.lacumGroupInformation.lakumInquiryInformationObjVersion.transferPointsAmountPerYear), + LacumPointsWidget( + mediaQuery, + 4, + TranslationBase.of(context).transferred, + 0, + model + .lacumGroupInformation + .lakumInquiryInformationObjVersion + .transferPoints, + model + .lacumGroupInformation + .lakumInquiryInformationObjVersion + .transferPointsAmountPerYear), ], ), ), + LacumPointsWidget( + mediaQuery, + 3, + TranslationBase.of(context).consumed, + model + .lacumGroupInformation + .lakumInquiryInformationObjVersion + .consumedPointsAmount != + null + ? int.parse(model + .lacumGroupInformation + .lakumInquiryInformationObjVersion + .consumedPointsAmount) + : 0, + model.lacumGroupInformation + .lakumInquiryInformationObjVersion.consumedPoints, + model + .lacumGroupInformation + .lakumInquiryInformationObjVersion + .consumedPointsAmountPerYear), SizedBox( - height: 20, + width: 8, ), SizedBox( height: 8, @@ -115,7 +197,8 @@ class LakumMainPage extends StatelessWidget { ), ), Container( - margin: EdgeInsets.symmetric(vertical: 16, horizontal: 8), + margin: + EdgeInsets.symmetric(vertical: 16, horizontal: 8), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ @@ -130,66 +213,66 @@ class LakumMainPage extends StatelessWidget { Padding( padding: EdgeInsets.symmetric(horizontal: 8), child: Texts( - "Expired", + TranslationBase.of(context).Expired, +// "Expired", fontSize: 14, ), ) ], ), Texts( - "${model.lacumGroupInformation.lakumInquiryInformationObjVersion.expiredPoints} Points", + "${model.lacumGroupInformation.lakumInquiryInformationObjVersion.expiredPoints}${TranslationBase.of(context).lakumPoint} ", fontWeight: FontWeight.bold, fontSize: 14, ), ], ), ), - SizedBox( - height: 2, - width: double.infinity, - child: Container( - color: Color(0xffefefef), - ), - ), + // Texts( + // "${model.lacumGroupInformation.lakumInquiryInformationObjVersion.expiredPoints} Points", + // fontWeight: FontWeight.bold, + // fontSize: 14, + // ), Container( - margin: EdgeInsets.symmetric(vertical: 16, horizontal: 8), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Row( + margin: + EdgeInsets.symmetric(vertical: 16, horizontal: 8), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Image.asset( - "assets/images/pharmacy_module/lakum/waiting_gained_icon.png", - fit: BoxFit.fill, - width: 20, - height: 25, + Row( + children: [ + Image.asset( + "assets/images/pharmacy_module/lakum/waiting_gained_icon.png", + fit: BoxFit.fill, + width: 20, + height: 25, + ), + Padding( + padding: + EdgeInsets.symmetric(horizontal: 8), + child: Texts( + TranslationBase.of(context) + .Waitinggained, +// "Waiting gained", + fontSize: 14, + ), + ) + ], ), - Padding( - padding: EdgeInsets.symmetric(horizontal: 8), - child: Texts( - "Waiting gained", - fontSize: 14, - ), - ) - ], - ), - Texts( - "${model.lacumGroupInformation.lakumInquiryInformationObjVersion.waitingPoints} Points", - fontWeight: FontWeight.bold, - fontSize: 14, - ), - ], - ), - ), - SizedBox( - height: 2, - width: double.infinity, - child: Container( - color: Color(0xffefefef), - ), - ), + Texts( + "${model.lacumGroupInformation.lakumInquiryInformationObjVersion.waitingPoints} ${TranslationBase.of(context).lakumPoint}", + fontWeight: FontWeight.bold, + fontSize: 14, + ), + ])), + // Texts( + // "${model.lacumGroupInformation.lakumInquiryInformationObjVersion.waitingPoints} Points", + // fontWeight: FontWeight.bold, + // fontSize: 14, + // ), Container( - margin: EdgeInsets.symmetric(vertical: 16, horizontal: 8), + margin: + EdgeInsets.symmetric(vertical: 16, horizontal: 8), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ @@ -204,20 +287,27 @@ class LakumMainPage extends StatelessWidget { Padding( padding: EdgeInsets.symmetric(horizontal: 8), child: Texts( - "Will Be Expired", + TranslationBase.of(context).WillBeExpired, +// "Will Be Expired", fontSize: 14, ), ) ], ), Texts( - "${model.lacumGroupInformation.lakumInquiryInformationObjVersion.pointsWillBeExpired} Points", + "${model.lacumGroupInformation.lakumInquiryInformationObjVersion.pointsWillBeExpired} ${TranslationBase.of(context).lakumPoint}", fontWeight: FontWeight.bold, fontSize: 14, ), ], ), + // Texts( + // "${model.lacumGroupInformation.lakumInquiryInformationObjVersion.pointsWillBeExpired} Points", + // fontWeight: FontWeight.bold, + // fontSize: 14, + // ), ), + SizedBox( height: 2, width: double.infinity, @@ -235,7 +325,11 @@ class LakumMainPage extends StatelessWidget { } navigateToLakumRegister(BuildContext context) { - Navigator.pushReplacement(context, FadePage(page: LakumRegistrationPage(projectViewModel.user.patientIdentificationNo))); + Navigator.pushReplacement( + context, + FadePage( + page: LakumRegistrationPage( + projectViewModel.user.patientIdentificationNo))); } } @@ -245,7 +339,12 @@ List _buildAppBarICons(BuildContext context, LacumViewModel model) { icon: Icon(Icons.settings), color: Colors.white, onPressed: () { - Navigator.push(context, FadePage(page: LakumSettingPage(model.lacumInformation, model.lacumGroupInformation))).then((result) => {model.getLacumGroupData()}); + Navigator.push( + context, + FadePage( + page: LakumSettingPage( + model.lacumInformation, model.lacumGroupInformation))) + .then((result) => {model.getLacumGroupData()}); }, ), ]; @@ -267,7 +366,9 @@ class LakumHomeButtons extends StatelessWidget { child: InkWell( onTap: () { print("Account activate click"); - Navigator.push(context, FadePage(page: LakumActivationVidaPage())).then((result) => {model.getLacumGroupData()}); + Navigator.push( + context, FadePage(page: LakumActivationVidaPage())) + .then((result) => {model.getLacumGroupData()}); }, child: Container( padding: EdgeInsets.symmetric(horizontal: 8), @@ -310,7 +411,12 @@ class LakumHomeButtons extends StatelessWidget { child: InkWell( onTap: () { print("Lacum transfer click"); - Navigator.push(context, FadePage(page: LacumTransferPage(model.lacumInformation, model.lacumGroupInformation))).then((result) => {model.getLacumGroupData()}); + Navigator.push( + context, + FadePage( + page: LacumTransferPage(model.lacumInformation, + model.lacumGroupInformation))) + .then((result) => {model.getLacumGroupData()}); }, child: Container( padding: EdgeInsets.symmetric(horizontal: 8), @@ -361,7 +467,8 @@ class LacumPointsWidget extends StatelessWidget { Color titleColor; final List pointsAmountPerYear; - LacumPointsWidget(this.mediaQuery, this.pointType, this.title, this.riyal, this.point, this.pointsAmountPerYear) { + LacumPointsWidget(this.mediaQuery, this.pointType, this.title, this.riyal, + this.point, this.pointsAmountPerYear) { if (pointType == 1) { titleColor = Color(0xffefefef); } else if (pointType == 2) { @@ -379,15 +486,18 @@ class LacumPointsWidget extends StatelessWidget { onTap: () { if (pointType != 1) { if (pointsAmountPerYear != null && pointsAmountPerYear.length > 0) { - Navigator.push(context, FadePage(page: LakumPointsYearPage(pointsAmountPerYear))); + Navigator.push(context, + FadePage(page: LakumPointsYearPage(pointsAmountPerYear))); } else { + AppToast.showErrorToast( + message: TranslationBase.of(context).lakumMsg); // show snackBar No Details Points are there } } }, child: Container( - width: mediaQuery.size.width / 2 - 16, - padding: EdgeInsets.only(top: 12, left: 8, right: 8, bottom: 4), + width: mediaQuery.size.width / 2 - 25, + padding: EdgeInsets.only(top: 12, left: 8, right: 8, bottom: 2), decoration: BoxDecoration( shape: BoxShape.rectangle, borderRadius: BorderRadius.circular(8), @@ -434,7 +544,8 @@ class LacumPointsWidget extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Texts( - "RIYAL", + TranslationBase.of(context).RIYAL, +// "RIYAL", fontSize: 13, fontWeight: FontWeight.bold, color: pointType == 1 ? Colors.white : Colors.black, @@ -460,12 +571,13 @@ class LacumPointsWidget extends StatelessWidget { ), Expanded( child: Container( - margin: EdgeInsets.only(left: 4), + margin: EdgeInsets.only(left: 8, right: 8), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ Texts( - "POINT", + TranslationBase.of(context).point, +// "POINT", fontSize: 12, fontWeight: FontWeight.bold, color: pointType == 1 ? Colors.white : Colors.black, diff --git a/lib/pages/pharmacies/screens/lakum-points-month-page.dart b/lib/pages/pharmacies/screens/lakum-points-month-page.dart index 47270eee..26c88755 100644 --- a/lib/pages/pharmacies/screens/lakum-points-month-page.dart +++ b/lib/pages/pharmacies/screens/lakum-points-month-page.dart @@ -26,7 +26,7 @@ class _LakumPointsMonthPageState extends State { return BaseView( builder: (_, model, wi) => AppScaffold( - title: "Lakum points", + title: TranslationBase.of(context).LakumPoint, isShowAppBar: true, isShowDecPage: false, backgroundColor: Colors.white, diff --git a/lib/pages/pharmacies/screens/lakum-points-year-page.dart b/lib/pages/pharmacies/screens/lakum-points-year-page.dart index f7b6d9e6..323f1a91 100644 --- a/lib/pages/pharmacies/screens/lakum-points-year-page.dart +++ b/lib/pages/pharmacies/screens/lakum-points-year-page.dart @@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/core/model/pharmacies/PointsAmountPerYear.d import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/lacum-viewmodel.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/widgets/lakum-point-table-row-widget.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; @@ -26,7 +27,7 @@ class _LakumPointsYearPageState extends State { return BaseView( builder: (_, model, wi) => AppScaffold( - title: "Lakum points", + title: TranslationBase.of(context).LakumPoint, isShowAppBar: true, isShowDecPage: false, backgroundColor: Colors.white, @@ -143,8 +144,8 @@ class LacumPointsYearWidget extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Texts( - "POINT", + Texts(TranslationBase.of(context).point, +// "POINT", fontSize: 12, fontWeight: FontWeight.bold, color: isSelected ? Colors.white : Colors.black, @@ -172,8 +173,8 @@ class LacumPointsYearWidget extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.center, children: [ - Texts( - "RIYAL", + Texts(TranslationBase.of(context).RIYAL, +// "RIYAL", fontSize: 13, fontWeight: FontWeight.bold, color: isSelected ? Colors.white : Colors.black, diff --git a/lib/pages/pharmacies/screens/order-preview-page.dart b/lib/pages/pharmacies/screens/order-preview-page.dart index d9646fcf..6b5f4f51 100644 --- a/lib/pages/pharmacies/screens/order-preview-page.dart +++ b/lib/pages/pharmacies/screens/order-preview-page.dart @@ -10,7 +10,7 @@ class OrderPreviewPage extends StatelessWidget { Widget build(BuildContext context) { return BaseView( builder: (_, model, wi) => AppScaffold( - title: "Shopping Cart", + title: TranslationBase.of(context).shoppingCart, isShowAppBar: true, isShowDecPage: false, baseViewModel: model, diff --git a/lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart b/lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart index a0a2bb48..bf45c539 100644 --- a/lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart +++ b/lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart @@ -85,7 +85,7 @@ class _FooterWidgetState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, ), Container( - height: 50.0, + height: 35.0, child: ListView( scrollDirection: Axis.horizontal, children: [ diff --git a/lib/pages/pharmacies/search_brands_page.dart b/lib/pages/pharmacies/search_brands_page.dart index ad592134..db9dbcb6 100644 --- a/lib/pages/pharmacies/search_brands_page.dart +++ b/lib/pages/pharmacies/search_brands_page.dart @@ -52,10 +52,12 @@ class _SearchBrandsPageState extends State { prefixIcon: Icon(Icons.search), inputAction: TextInputAction.search, inputFormatters: [ - FilteringTextInputFormatter.deny(RegExp("[\u0621-\u064a-\ ]")) + FilteringTextInputFormatter.allow(RegExp(r'([A-Za-z0-9 a space])') +// ("[\u0621-\u064a-\ ]") + ) ], validator: (value) { - RegExp regExp = RegExp('[\u0621-\u064a-\ ]'); + RegExp regExp = RegExp(r'([A-Za-z0-9 a space])'); if (value.isEmpty) { TranslationBase.of(context).pleaseEnterProductName; }else if (regExp.hasMatch(value)){ diff --git a/lib/pages/pharmacies/widgets/ProductTileItem.dart b/lib/pages/pharmacies/widgets/ProductTileItem.dart index a24531a5..278fc6aa 100644 --- a/lib/pages/pharmacies/widgets/ProductTileItem.dart +++ b/lib/pages/pharmacies/widgets/ProductTileItem.dart @@ -125,12 +125,12 @@ class ProductTileItem extends StatelessWidget { ], ), Padding( - padding: EdgeInsets.fromLTRB(4,2,4,2), + padding: EdgeInsets.fromLTRB(1,1,1,1), child: Container( -// width: item.rxMessage != null -// ? MediaQuery.of(context).size.width / 5 -// : 0, - // padding: EdgeInsets.fromLTRB(6,4,6,4), + width: item.rxMessage != null + ? MediaQuery.of(context).size.width / 1.0 + : 0, + padding: EdgeInsets.fromLTRB(8,2,8,2), decoration: BoxDecoration( color: Color(0xffb23838), diff --git a/lib/pages/pharmacies/widgets/lacum-banner-widget.dart b/lib/pages/pharmacies/widgets/lacum-banner-widget.dart index 14a53e72..a15b385d 100644 --- a/lib/pages/pharmacies/widgets/lacum-banner-widget.dart +++ b/lib/pages/pharmacies/widgets/lacum-banner-widget.dart @@ -125,8 +125,8 @@ class _LakumBannerWidgetState extends State { Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Texts( - "IDENTIFICATION #", + Texts(TranslationBase.of(context).IDENTIFICATION, +// "IDENTIFICATION #", fontSize: 14, fontWeight: FontWeight.bold, color: Colors.black, @@ -143,8 +143,8 @@ class _LakumBannerWidgetState extends State { Column( crossAxisAlignment: CrossAxisAlignment.end, children: [ - Texts( - "MEMBER SINCE", + Texts(TranslationBase.of(context).MEMBERSINCE, +// "MEMBER SINCE", fontSize: 14, fontWeight: FontWeight.bold, color: Colors.black, @@ -168,8 +168,8 @@ class _LakumBannerWidgetState extends State { Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Texts( - "MOBILE #", + Texts(TranslationBase.of(context).lakumMobile, +// "MOBILE #", fontSize: 14, fontWeight: FontWeight.bold, color: Colors.black, diff --git a/lib/pages/search_products_page.dart b/lib/pages/search_products_page.dart index 954546d7..b7f08378 100644 --- a/lib/pages/search_products_page.dart +++ b/lib/pages/search_products_page.dart @@ -59,11 +59,11 @@ class _SearchProductsPageState extends State { prefixIcon: Icon(Icons.search), inputAction: TextInputAction.search, inputFormatters: [ - FilteringTextInputFormatter.deny( - RegExp("[\u0621-\u064a-\ ]")) + FilteringTextInputFormatter.allow( + RegExp(r'([A-Za-z0-9 a space])')) ], validator: (value) { - RegExp regExp = RegExp('[\u0621-\u064a-\ ]'); + RegExp regExp = RegExp(r'([A-Za-z0-9 a space])'); if (value.isEmpty) { TranslationBase.of(context) .pleaseEnterProductName; diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index 92656188..8db305d7 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -941,6 +941,28 @@ class TranslationBase { String get lakum => localizedValues['lakum'][locale.languageCode]; + String get lakumMsg => localizedValues['lakumMsg'][locale.languageCode]; + + String get lakumPoint => localizedValues['lakumPoint'][locale.languageCode]; + + String get MEMBERSINCE => localizedValues['MEMBERSINCE'][locale.languageCode]; + + String get IDENTIFICATION => localizedValues['IDENTIFICATION'][locale.languageCode]; + + String get lakumMobile => localizedValues['lakumMobile'][locale.languageCode]; + + String get Waitinggained => localizedValues['Waitinggained'][locale.languageCode]; + + String get Expired => localizedValues['Expired'][locale.languageCode]; + + String get WillBeExpired => localizedValues['WillBeExpired'][locale.languageCode]; + + String get RIYAL => localizedValues['RIYAL'][locale.languageCode]; + + String get LakumPoint => localizedValues['LakumPoint'][locale.languageCode]; + + String get ActivateLAKUMAccount => localizedValues['ActivateLAKUMAccount'][locale.languageCode]; + String get wishlist => localizedValues['wishlist'][locale.languageCode]; String get brands => localizedValues['brands'][locale.languageCode]; @@ -1072,6 +1094,8 @@ class TranslationBase { String get offersAndPromotions => localizedValues['offersAndPromotions'][locale.languageCode]; + String get offers => localizedValues['offers'][locale.languageCode]; + String get review => localizedValues['review'][locale.languageCode]; String get deliveredOrder => localizedValues['deliveredOrder'][locale.languageCode];