diff --git a/lib/config/config.dart b/lib/config/config.dart index 6f05a414..bca5db17 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -15,8 +15,8 @@ const PACKAGES_CUSTOMER = '/api/customers'; const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items'; const PACKAGES_ORDERS = '/api/orders'; const PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; -// const BASE_URL = 'https://uat.hmgwebservices.com/'; -const BASE_URL = 'https://hmgwebservices.com/'; +const BASE_URL = 'https://uat.hmgwebservices.com/'; +// const BASE_URL = 'https://hmgwebservices.com/'; // Pharmacy UAT URLs // const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; diff --git a/lib/pages/ChildVaccines/new/child_vaccine_page.dart b/lib/pages/ChildVaccines/new/child_vaccine_page.dart index 5f55401e..4d8b878c 100644 --- a/lib/pages/ChildVaccines/new/child_vaccine_page.dart +++ b/lib/pages/ChildVaccines/new/child_vaccine_page.dart @@ -120,43 +120,54 @@ class _ChildPageState extends State with SingleTickerProviderS ], ), ), - InkWell( - onTap: () async { - await model.deleteBabyOrders(newChild: deleteBaby); + Column( + mainAxisAlignment: MainAxisAlignment.end, + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Icon( + Icons.arrow_forward, + size: 18, + ), + mHeight(12), + InkWell( + onTap: () async { + await model.deleteBabyOrders(newChild: deleteBaby); - deleteBaby.babyID = model.babyInformationModelList[index].babyID; + deleteBaby.babyID = model.babyInformationModelList[index].babyID; - await model.deleteBabyOrders(newChild: deleteBaby); - if (model.isDeleted) { - AppToast.showSuccessToast(message: TranslationBase.of(context).recordDeleted); - Navigator.pop(context, model.isDeleted); - } else { - //TODO handling error - } - }, - child: Container( - decoration: containerRadius(Colors.grey.withOpacity(0.2), 2000), - padding: EdgeInsets.only(left: 12, right: 12, top: 8, bottom: 8), - child: Row( - children: [ - Image.asset( - 'assets/images/new-design/garbage.png', - width: 16, - color: selectedColor, - ), - mWidth(8), - Text( - TranslationBase.of(context).deleteView, - style: TextStyle( - fontSize: 11, - fontWeight: FontWeight.w600, - letterSpacing: -0.33, - color: selectedColor, - ), + await model.deleteBabyOrders(newChild: deleteBaby); + if (model.isDeleted) { + AppToast.showSuccessToast(message: TranslationBase.of(context).recordDeleted); + Navigator.pop(context, model.isDeleted); + } else { + //TODO handling error + } + }, + child: Container( + decoration: containerRadius(Colors.grey.withOpacity(0.2), 2000), + padding: EdgeInsets.only(left: 12, right: 12, top: 8, bottom: 8), + child: Row( + children: [ + Image.asset( + 'assets/images/new-design/garbage.png', + width: 16, + color: selectedColor, + ), + mWidth(8), + Text( + TranslationBase.of(context).deleteView, + style: TextStyle( + fontSize: 11, + fontWeight: FontWeight.w600, + letterSpacing: -0.33, + color: selectedColor, + ), + ), + ], ), - ], + ), ), - ), + ], ), ], ), diff --git a/lib/pages/livecare/clinic_timings_page.dart b/lib/pages/livecare/clinic_timings_page.dart index 7e92a3c4..cd1652f2 100644 --- a/lib/pages/livecare/clinic_timings_page.dart +++ b/lib/pages/livecare/clinic_timings_page.dart @@ -78,18 +78,18 @@ class _LiveCarePatmentPageState extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Expanded( - flex: 1, + flex: 2, child: Text( item.dayOfWeekStr, style: TextStyle( - fontSize: 13, - letterSpacing: -0.42, - fontWeight: FontWeight.w600, + fontSize: 18, + letterSpacing: -0.72, + fontWeight: FontWeight.bold, ), ), ), Expanded( - flex: 3, + flex: 4, child: Container( width: double.infinity, decoration: cardRadius(12),