Merge branch 'development_new_design_2.0' into haroon-new-design

merge-requests/472/head
haroon amjad 4 years ago
commit fa5fd8e323

@ -15,8 +15,8 @@ const PACKAGES_CUSTOMER = '/api/customers';
const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items'; const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items';
const PACKAGES_ORDERS = '/api/orders'; const PACKAGES_ORDERS = '/api/orders';
const PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; const PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
// const BASE_URL = 'https://uat.hmgwebservices.com/'; const BASE_URL = 'https://uat.hmgwebservices.com/';
const BASE_URL = 'https://hmgwebservices.com/'; // const BASE_URL = 'https://hmgwebservices.com/';
// Pharmacy UAT URLs // Pharmacy UAT URLs
// const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; // const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';

@ -760,6 +760,8 @@ const Map localizedValues = {
"location-permission": {"en": "Location", "ar": "تحديد المواقع"}, "location-permission": {"en": "Location", "ar": "تحديد المواقع"},
"needPrescription": {"en": "This product requires a prescription", "ar": " هذا المنتج يتطلب وصفة طبية"}, "needPrescription": {"en": "This product requires a prescription", "ar": " هذا المنتج يتطلب وصفة طبية"},
"outOfStockMsg": {"en": "You have added product which is out of stock now, Please remove that!", "ar": "لقد قمت بإضافة المنتج الذي نفذ من المخزون الآن. يرجى إزالة ذلك"}, "outOfStockMsg": {"en": "You have added product which is out of stock now, Please remove that!", "ar": "لقد قمت بإضافة المنتج الذي نفذ من المخزون الآن. يرجى إزالة ذلك"},
"noArabicLetters": {"en": "It Is Not Allow to Use Arabic Letters", "ar": "غير مسموح باستخدام الحروف العربيه"},
"noOffersAvailable": {"en": "No Offers Available!", "ar": "لايوجد عروض حاليا"},
"accessibility": {"en": "Accessibility Mode", "ar": "وضع امكانية الوصول"}, "accessibility": {"en": "Accessibility Mode", "ar": "وضع امكانية الوصول"},
"orderStatus": {"en": "Order Status", "ar": "حالة الطلب"}, "orderStatus": {"en": "Order Status", "ar": "حالة الطلب"},
"CancelOrder": {"en": "Cancel Order", "ar": "الغاء الطلب"}, "CancelOrder": {"en": "Cancel Order", "ar": "الغاء الطلب"},

@ -431,6 +431,7 @@ class BaseAppClient {
} }
print("URL : $url"); print("URL : $url");
var ss = json.encode(queryParams);
if (await Utils.checkConnection()) { if (await Utils.checkConnection()) {
final response = await http.get(url.trim(), headers: { final response = await http.get(url.trim(), headers: {

@ -4,6 +4,8 @@ import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/Country.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/Country.dart';
import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer_addresses_service.dart'; import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer_addresses_service.dart';
import 'package:diplomaticquarterapp/services/pharmacy_services/pharmacyAddress_service.dart'; import 'package:diplomaticquarterapp/services/pharmacy_services/pharmacyAddress_service.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:flutter_webrtc/flutter_webrtc.dart';
import 'package:google_maps_place_picker/google_maps_place_picker.dart'; import 'package:google_maps_place_picker/google_maps_place_picker.dart';
import '../../../locator.dart'; import '../../../locator.dart';
@ -75,13 +77,17 @@ class PharmacyAddressesViewModel extends BaseViewModel {
sendingAddress.createdOnUtc = DateTime.now().toString(); sendingAddress.createdOnUtc = DateTime.now().toString();
if (editedAddress == null) { if (editedAddress == null) {
///TODO Fatima*
await _pharmacyAddressService.addCustomerAddress(sendingAddress); await _pharmacyAddressService.addCustomerAddress(sendingAddress);
} else { } else {
await _pharmacyAddressService.editCustomerAddress(sendingAddress); await _pharmacyAddressService.editCustomerAddress(sendingAddress);
} }
if (_pharmacyAddressService.hasError) { if (_pharmacyAddressService.hasError) {
error = _pharmacyAddressService.error; error = _pharmacyAddressService.error;
Utils.showErrorToast(error);
setState(ViewState.Error); setState(ViewState.Error);
} else { } else {
setState(ViewState.Idle); setState(ViewState.Idle);

@ -120,6 +120,15 @@ class _ChildPageState extends State<ChildVaccinePage> with SingleTickerProviderS
], ],
), ),
), ),
Column(
mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Icon(
Icons.arrow_forward,
size: 18,
),
mHeight(12),
InkWell( InkWell(
onTap: () async { onTap: () async {
await model.deleteBabyOrders(newChild: deleteBaby); await model.deleteBabyOrders(newChild: deleteBaby);
@ -160,6 +169,8 @@ class _ChildPageState extends State<ChildVaccinePage> with SingleTickerProviderS
), ),
], ],
), ),
],
),
), ),
); );
}, },

@ -3,7 +3,7 @@ import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacy_categorise_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacy_categorise_view_model.dart';
import 'package:diplomaticquarterapp/locator.dart'; import 'package:diplomaticquarterapp/locator.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-order-page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-page/cart-order-page.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
@ -198,7 +198,8 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
), ),
margin: EdgeInsets.symmetric( margin: EdgeInsets.symmetric(
horizontal: 8, horizontal: 8,
vertical: 4, vertical: 1,
// vertical: 2,
), ),
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
@ -210,11 +211,17 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
color: Colors.white, color: Colors.white,
), ),
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: 0), horizontal: 4,
width: MediaQuery.of(context) ),
.size width: MediaQuery.of(context).size.width / 3,
.width / // width: MediaQuery.of(context)
3, // .size
// .width /
// 1,
// height: MediaQuery.of(context)
// .size
// .width /
// 1,
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment CrossAxisAlignment
@ -224,7 +231,7 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
children: [ children: [
Container( Container(
margin: EdgeInsets margin: EdgeInsets
.fromLTRB(0, 16, .fromLTRB(0, 1,
0, 0), 0, 0),
alignment: Alignment alignment: Alignment
.center, .center,
@ -242,10 +249,68 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
.thumb .thumb
: 'https://upload.wikimedia.org/wikipedia/commons/thumb/6/6c/No_image_3x4.svg/1200px-No_image_3x4.svg.png', : 'https://upload.wikimedia.org/wikipedia/commons/thumb/6/6c/No_image_3x4.svg/1200px-No_image_3x4.svg.png',
fit: BoxFit.cover, fit: BoxFit.cover,
height: 80, height: 70,
), ),
),
// Container(
// width: model
// .finalProducts[
// index]
// .rxMessage !=
// null
// ? MediaQuery.of(
// context)
// .size
// .width /
// 2.8
// : 0,
// padding:
// EdgeInsets.all(
// 4),
// decoration:
// BoxDecoration(
// color: Color(
// 0xffb23838),
// borderRadius: BorderRadius.only(
// topLeft: Radius
// .circular(
// 6)),
// ),
// child: model
// .finalProducts[
// index]
// .rxMessage !=
// null
// ? Texts(
// languageID ==
// 'ar'
// ? model
// .finalProducts[
// index]
// .rxMessagen
// : model
// .finalProducts[index]
// .rxMessage,
// color: Colors
// .white,
// regular:
// true,
// fontSize:
// 10,
// fontWeight:
// FontWeight
// .w600,
// )
// : Texts(""),
// ),
],
), ),
Container( Container(
margin: EdgeInsets
.symmetric(
horizontal: 0,
vertical: 2,
),
width: model width: model
.finalProducts[ .finalProducts[
index] index]
@ -255,19 +320,18 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
context) context)
.size .size
.width / .width /
2.8 2.0
: 0, : 0,
padding: padding:
EdgeInsets.all( EdgeInsets.fromLTRB(8,4,8,4),
4),
decoration: decoration:
BoxDecoration( BoxDecoration(
color: Color( color: Color(
0xffb23838), 0xffb23838),
borderRadius: BorderRadius.only( // borderRadius: BorderRadius.only(
topLeft: Radius // topLeft: Radius
.circular( // .circular(
6)), // 6)),
), ),
child: model child: model
.finalProducts[ .finalProducts[
@ -296,8 +360,6 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
) )
: Texts(""), : Texts(""),
), ),
],
),
Container( Container(
margin: EdgeInsets margin: EdgeInsets
.symmetric( .symmetric(
@ -439,6 +501,8 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
(BuildContext context, int index) { (BuildContext context, int index) {
return InkWell( return InkWell(
child: Card( child: Card(
child: Padding(
padding: const EdgeInsets.all(4.0),
child: Row( child: Row(
children: [ children: [
Stack( Stack(
@ -452,16 +516,16 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
padding: padding:
EdgeInsets EdgeInsets
.only( .only(
left: 9.0, left: 2.0,
top: 8.0, top: 2.0,
right: 10.0, right: 2.0,
), ),
), ),
), ),
Container( Container(
margin: EdgeInsets // margin: EdgeInsets
.fromLTRB( // .fromLTRB(
0, 0, 0, 0), // 8, 0, 8, 0),
alignment: Alignment alignment: Alignment
.center, .center,
child: child:
@ -479,14 +543,86 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
: 'https://upload.wikimedia.org/wikipedia/commons/thumb/6/6c/No_image_3x4.svg/1200px-No_image_3x4.svg.png', : 'https://upload.wikimedia.org/wikipedia/commons/thumb/6/6c/No_image_3x4.svg/1200px-No_image_3x4.svg.png',
fit: BoxFit fit: BoxFit
.contain, .contain,
height: 80, height: 70,
), ),
), ),
], ],
), ),
Column( // Column(
// children: [
// Container(
// width: model
// .finalProducts[
// index]
// .rxMessage !=
// null
// ? MediaQuery.of(
// context)
// .size
// .width /
// 5.3
// : 0,
// padding:
// EdgeInsets.all(
// 4),
// decoration:
// BoxDecoration(
// color: Color(
// 0xffb23838),
// borderRadius: BorderRadius.only(
// topLeft: Radius
// .circular(
// 6)),
// ),
// child: Texts(
// model
// .finalProducts[
// index]
// .rxMessage !=
// null
// ? model
// .finalProducts[
// index]
// .rxMessage
// : "",
// color:
// Colors.white,
// regular: true,
// fontSize: 10,
// fontWeight:
// FontWeight
// .w600,
// ),
// ),
// ],
// ),
],
),
Container(
height: 130.0,
margin:
EdgeInsets.symmetric(
horizontal: 0,
vertical: 6,
),
child: Column(
mainAxisAlignment:
MainAxisAlignment
.spaceAround,
crossAxisAlignment:
CrossAxisAlignment
.start,
children: [ children: [
Container( Container(
margin: EdgeInsets
.symmetric(
horizontal: 4,
vertical: 0,
),
width: model width: model
.finalProducts[ .finalProducts[
index] index]
@ -496,7 +632,7 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
context) context)
.size .size
.width / .width /
5.3 2.0
: 0, : 0,
padding: padding:
EdgeInsets.all( EdgeInsets.all(
@ -505,50 +641,38 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
BoxDecoration( BoxDecoration(
color: Color( color: Color(
0xffb23838), 0xffb23838),
borderRadius: BorderRadius.only( // borderRadius: BorderRadius.only(
topLeft: Radius // topLeft: Radius
.circular( // .circular(
6)), // 6)),
), ),
child: Texts( child: model
model
.finalProducts[ .finalProducts[
index] index]
.rxMessage != .rxMessage !=
null null
? Texts(
languageID ==
'ar'
? model ? model
.finalProducts[ .finalProducts[
index] index]
.rxMessage .rxMessagen
: "", : model
color: .finalProducts[index]
Colors.white, .rxMessage,
regular: true, color: Colors
fontSize: 10, .white,
regular:
true,
fontSize:
10,
fontWeight: fontWeight:
FontWeight FontWeight
.w600, .w600,
)
: Texts(""),
), ),
),
],
),
],
),
Container(
height: 100.0,
margin:
EdgeInsets.symmetric(
horizontal: 6,
vertical: 0,
),
child: Column(
mainAxisAlignment:
MainAxisAlignment
.spaceAround,
crossAxisAlignment:
CrossAxisAlignment
.start,
children: [
SizedBox( SizedBox(
height: 4.0, height: 4.0,
), ),
@ -640,6 +764,7 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
], ],
), ),
), ),
),
onTap: () => { onTap: () => {
Navigator.push( Navigator.push(
context, context,

@ -4,7 +4,7 @@ import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart'
import 'package:diplomaticquarterapp/core/service/client/base_app_client.dart'; import 'package:diplomaticquarterapp/core/service/client/base_app_client.dart';
import 'package:diplomaticquarterapp/core/service/parmacyModule/parmacy_module_service.dart'; import 'package:diplomaticquarterapp/core/service/parmacyModule/parmacy_module_service.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-order-page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-page/cart-order-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/pharmacy_module_page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/pharmacy_module_page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/product-detail.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/product-detail.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/profile/profile.dart'; import 'package:diplomaticquarterapp/pages/pharmacy/profile/profile.dart';

@ -78,18 +78,18 @@ class _LiveCarePatmentPageState extends State<ClinicTimingsPage> {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Expanded( Expanded(
flex: 1, flex: 2,
child: Text( child: Text(
item.dayOfWeekStr, item.dayOfWeekStr,
style: TextStyle( style: TextStyle(
fontSize: 13, fontSize: 18,
letterSpacing: -0.42, letterSpacing: -0.72,
fontWeight: FontWeight.w600, fontWeight: FontWeight.bold,
), ),
), ),
), ),
Expanded( Expanded(
flex: 3, flex: 4,
child: Container( child: Container(
width: double.infinity, width: double.infinity,
decoration: cardRadius(12), decoration: cardRadius(12),

@ -1,5 +1,6 @@
import 'package:diplomaticquarterapp/core/viewModels/offers_Categorise_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/offers_Categorise_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/StarRating.dart'; import 'package:diplomaticquarterapp/widgets/others/StarRating.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_pharmacy_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_pharmacy_widget.dart';
@ -698,9 +699,31 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
), ),
) )
: Center( : Center(
child: Texts( child: Column(
"SORRY , there's no listed offers now :(", mainAxisAlignment: MainAxisAlignment.center,
color: Colors.green, children: [
)))); Padding(
padding: const EdgeInsets.all(8.0),
child: Image.asset(
'assets/images/new-design/empty_box.png',
width: 100,
height: 100,
fit: BoxFit.cover,
),
),
Padding(
padding: const EdgeInsets.all(8.0),
child: Text(TranslationBase.of(context).noOffersAvailable,
// 'There is no data',
style: TextStyle(fontSize: 30),
),
)
],
),
// child: Texts(
// "SORRY , there's no listed offers now :(",
// color: Colors.green,
// )
)));
} }
} }

@ -6,7 +6,7 @@ import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_deta
import 'package:diplomaticquarterapp/core/viewModels/pharmacy_categorise_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacy_categorise_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/locator.dart'; import 'package:diplomaticquarterapp/locator.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-order-page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-page/cart-order-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/product-detail.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/product-detail.dart';
import 'package:diplomaticquarterapp/pages/sub_categorise_page.dart'; import 'package:diplomaticquarterapp/pages/sub_categorise_page.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
@ -1031,7 +1031,7 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
.thumb .thumb
: 'https://upload.wikimedia.org/wikipedia/commons/thumb/6/6c/No_image_3x4.svg/1200px-No_image_3x4.svg.png', : 'https://upload.wikimedia.org/wikipedia/commons/thumb/6/6c/No_image_3x4.svg/1200px-No_image_3x4.svg.png',
fit: BoxFit.contain, fit: BoxFit.contain,
height: 80, height: 70,
), ),
), ),
], ],
@ -1086,7 +1086,7 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
), ),
Container( Container(
margin: EdgeInsets.symmetric( margin: EdgeInsets.symmetric(
horizontal: 6, horizontal: 0,
vertical: 0, vertical: 0,
), ),
child: Column( child: Column(

@ -19,7 +19,7 @@ import 'package:flutter/material.dart';
import 'package:http/http.dart'; import 'package:http/http.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'cart-page/cart-order-preview.dart'; import 'cart-order-preview.dart';
class CartOrderPage extends StatefulWidget { class CartOrderPage extends StatefulWidget {
@ -421,7 +421,7 @@ class _OrderBottomWidgetState extends State<OrderBottomWidget> {
fontSize: 14), fontSize: 14),
), ),
color: Color(0xFF4CAF50), color: Color(0xFF4CAF50),
disabledColor:Color(0xFF4CAF50), disabledColor:Color(0xFF848484),
// disabledColor: Color(0xff005aff), // disabledColor: Color(0xff005aff),
) )
// RaisedButton( // RaisedButton(

@ -53,9 +53,10 @@ class _PharmacyPageState extends State<PharmacyPage> {
children: <Widget>[ children: <Widget>[
BannerPager(model), BannerPager(model),
PrescriptionsWidget(), PrescriptionsWidget(),
ShopByBrandWidget(), // ShopByBrandWidget(),
RecentlyViewedWidget(), RecentlyViewedWidget(),
BestSellerWidget(), BestSellerWidget(),
ShopByBrandWidget(),
], ],
), ),
), ),

@ -1,7 +1,7 @@
import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart';
import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-order-page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-page/cart-order-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/footor/quantity_box.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/footor/quantity_box.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
@ -128,13 +128,15 @@ class _FooterWidgetState extends State<FooterWidget> {
: Container( : Container(
height: 20, height: 20,
), ),
Row( Container(
height: 58,
child: Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( Container(
width: 70, width: 90,
height: 50, height: 60,
child: FlatButton( child: FlatButton(
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
@ -169,8 +171,11 @@ class _FooterWidgetState extends State<FooterWidget> {
}, },
), ),
), ),
SizedBox(
width: 10,
),
Container( Container(
width: MediaQuery.of(context).size.width * 0.45, width: MediaQuery.of(context).size.width * 0.35,
child: SecondaryButton( child: SecondaryButton(
label: TranslationBase.of(context).addToCart.toUpperCase(), label: TranslationBase.of(context).addToCart.toUpperCase(),
disabled: (!widget.isAvailable && widget.quantity > 0) || widget.quantity > widget.quantityLimit || widget.item.isRx, disabled: (!widget.isAvailable && widget.quantity > 0) || widget.quantity > widget.quantityLimit || widget.item.isRx,
@ -197,11 +202,16 @@ class _FooterWidgetState extends State<FooterWidget> {
label: TranslationBase.of(context).buyNow.toUpperCase(), label: TranslationBase.of(context).buyNow.toUpperCase(),
disabled: (!widget.isAvailable && widget.quantity > 0) || (widget.quantity > widget.quantityLimit) || widget.item.isRx, disabled: (!widget.isAvailable && widget.quantity > 0) || (widget.quantity > widget.quantityLimit) || widget.item.isRx,
onTap: () async { onTap: () async {
if (!authenticatedUserObject.isLogin) {
Navigator.of(context).pushNamed(
WELCOME_LOGIN,
);
} else {
await widget.addToShoppingCartFunction(quantity: widget.quantity, itemID: widget.item.id, model: widget.model); await widget.addToShoppingCartFunction(quantity: widget.quantity, itemID: widget.item.id, model: widget.model);
Navigator.push( Navigator.push(
context, context,
FadePage(page: CartOrderPage()), FadePage(page: CartOrderPage()),
); );}
}, },
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
borderColor: Colors.grey[800], borderColor: Colors.grey[800],
@ -212,8 +222,10 @@ class _FooterWidgetState extends State<FooterWidget> {
), ),
], ],
), ),
),
], ],
), ),
); );
} }

@ -4,7 +4,7 @@ import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart'
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/compare-list.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/compare-list.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-order-page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-page/cart-order-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/product-name-and-price.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/product-name-and-price.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/recommended_products.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/recommended_products.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/reviews_info.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/reviews_info.dart';

@ -2,7 +2,7 @@ import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart'
import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/OrderPreviewViewModel.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/OrderPreviewViewModel.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-order-page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-page/cart-order-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/product-detail.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/product-detail.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
@ -79,7 +79,7 @@ class ProductAppBar extends StatelessWidget with PreferredSizeWidget {
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(15),
), ),
padding: EdgeInsets.only(left: 5, right: 4.5), padding: EdgeInsets.only(left: 5, right: 4.5),
height: 18, height: 19,
child: Center( child: Center(
child: Texts( child: Texts(
orderPreviewViewModel.cartResponse.quantityCount.toString(), orderPreviewViewModel.cartResponse.quantityCount.toString(),

@ -1,11 +1,14 @@
import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/brand_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/brand_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/input/text_field.dart'; import 'package:diplomaticquarterapp/widgets/input/text_field.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_pharmacy_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_pharmacy_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
class SearchBrandsPage extends StatefulWidget { class SearchBrandsPage extends StatefulWidget {
@override @override
@ -23,7 +26,7 @@ class _SearchBrandsPageState extends State<SearchBrandsPage> {
onModelReady: (model) => model.searchProducts(), onModelReady: (model) => model.searchProducts(),
builder: (BuildContext context, model, Widget child) => builder: (BuildContext context, model, Widget child) =>
PharmacyAppScaffold( PharmacyAppScaffold(
appBarTitle: 'Search', appBarTitle: TranslationBase.of(context).search,
isBottomBar: false, isBottomBar: false,
isShowAppBar: true, isShowAppBar: true,
backgroundColor: Colors.white, backgroundColor: Colors.white,
@ -44,24 +47,36 @@ class _SearchBrandsPageState extends State<SearchBrandsPage> {
key: _formKey, key: _formKey,
child: TextFields( child: TextFields(
autoFocus: true, autoFocus: true,
hintText: 'Search', hintText: TranslationBase.of(context).search,
fontSize: 19.0, fontSize: 19.0,
prefixIcon: Icon(Icons.search), prefixIcon: Icon(Icons.search),
inputAction: TextInputAction.search, inputAction: TextInputAction.search,
inputFormatters: <TextInputFormatter>[
FilteringTextInputFormatter.deny(RegExp("[\u0621-\u064a-\ ]"))
],
validator: (value) {
RegExp regExp = RegExp('[\u0621-\u064a-\ ]');
if (value.isEmpty) {
TranslationBase.of(context).pleaseEnterProductName;
}else if (regExp.hasMatch(value)){
AppToast.showErrorToast(message: TranslationBase.of(context).noArabicLetters);
}
return null;
},
onSaved: (value) { onSaved: (value) {
//searchMedicine(model, context); //searchMedicine(model, context);
}, },
onSubmit: (value) { onSubmit: (value) {
searchMedicine(model, context); searchMedicine(model, context);
msg = 'No Result Found'; msg = TranslationBase.of(context).noResultFound;
}, },
controller: textController, controller: textController,
validator: (value) { // validator: (value) {
if (value.isEmpty) { // if (value.isEmpty) {
return 'please Enter Product Name'; // return 'please Enter Product Name';
} // }
return null; // return null;
}, // },
), ),
), ),
), ),
@ -70,7 +85,7 @@ class _SearchBrandsPageState extends State<SearchBrandsPage> {
), ),
InkWell( InkWell(
child: Texts( child: Texts(
'Cancel', TranslationBase.of(context).cancel,
fontSize: 17.0, fontSize: 17.0,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),

@ -86,7 +86,7 @@ class ProductTileItem extends StatelessWidget {
Stack( Stack(
children: [ children: [
Container( Container(
margin: EdgeInsets.fromLTRB(0, 16, 0, 0), margin: EdgeInsets.fromLTRB(0, 0, 0, 0),
alignment: Alignment.center, alignment: Alignment.center,
child: (item.images != null && item.images.length > 0) child: (item.images != null && item.images.length > 0)
? Image.network( ? Image.network(
@ -100,15 +100,40 @@ class ProductTileItem extends StatelessWidget {
height: itemHeight / 2, height: itemHeight / 2,
), ),
), ),
Container( // Container(
width: item.rxMessage != null // width: item.rxMessage != null
? MediaQuery.of(context).size.width / 5 // ? MediaQuery.of(context).size.width / 5
: 0, // : 0,
padding: EdgeInsets.all(4), // padding: EdgeInsets.all(4),
// decoration: BoxDecoration(
// color: Color(0xffb23838),
// borderRadius:
// BorderRadius.only(topLeft: Radius.circular(6)),
// ),
// child: item.rxMessage != null
// ? Texts(
// projectProvider.isArabic
// ? item.rxMessagen
// : item.rxMessage,
// color: Colors.white,
// regular: true,
// fontSize: 10,
// fontWeight: FontWeight.w400,
// )
// : Texts(""),
// )
],
),
Padding(
padding: EdgeInsets.fromLTRB(4,2,4,2),
child: Container(
// width: item.rxMessage != null
// ? MediaQuery.of(context).size.width / 5
// : 0,
// padding: EdgeInsets.fromLTRB(6,4,6,4),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xffb23838), color: Color(0xffb23838),
borderRadius:
BorderRadius.only(topLeft: Radius.circular(6)),
), ),
child: item.rxMessage != null child: item.rxMessage != null
? Texts( ? Texts(
@ -121,12 +146,11 @@ class ProductTileItem extends StatelessWidget {
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
) )
: Texts(""), : Texts(""),
)
],
), ),
SizedBox(height: 8,), ),
// SizedBox(height: 4,),
Padding( Padding(
padding: const EdgeInsets.symmetric(horizontal: 6.0), padding: const EdgeInsets.symmetric(horizontal: 4.0),
child: Texts( child: Texts(
projectProvider.isArabic ? item.namen : item.name, projectProvider.isArabic ? item.namen : item.name,
regular: true, regular: true,
@ -137,7 +161,7 @@ class ProductTileItem extends StatelessWidget {
Expanded( Expanded(
child: Container( child: Container(
margin: EdgeInsets.symmetric( margin: EdgeInsets.symmetric(
horizontal: 6, horizontal: 4,
vertical: 0, vertical: 0,
), ),
child: Column( child: Column(
@ -145,7 +169,7 @@ class ProductTileItem extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: [ children: [
Padding( Padding(
padding: const EdgeInsets.only(top: 4, bottom: 4), padding: const EdgeInsets.only(top: 2, bottom: 2),
child: Texts( child: Texts(
"SAR ${item.price}", "SAR ${item.price}",
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,

@ -1,5 +1,7 @@
import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/PrescriptionViewModel.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/PrescriptionViewModel.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/locator.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/widgets/home/ViewAllHomeWidget.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/widgets/home/ViewAllHomeWidget.dart';
@ -11,6 +13,10 @@ import 'package:provider/provider.dart';
import 'package:rating_bar/rating_bar.dart'; import 'package:rating_bar/rating_bar.dart';
class PrescriptionsWidget extends StatelessWidget { class PrescriptionsWidget extends StatelessWidget {
AuthenticatedUserObject authenticatedUserObject =
locator<AuthenticatedUserObject>();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseView<PrescriptionViewModel>( return BaseView<PrescriptionViewModel>(
@ -20,7 +26,7 @@ class PrescriptionsWidget extends StatelessWidget {
} }
}, },
allowAny: true, allowAny: true,
builder: (_, model, wi) => model.prescriptionsList.length > 0 builder: (_, model, wi) => model.prescriptionsList.length > 0 && authenticatedUserObject.isLogin
? NetworkBaseView( ? NetworkBaseView(
isLocalLoader: true, isLocalLoader: true,
baseViewModel: model, baseViewModel: model,
@ -30,7 +36,7 @@ class PrescriptionsWidget extends StatelessWidget {
ViewAllHomeWidget(TranslationBase.of(context).myPrescription, HomePrescriptionsPage()), ViewAllHomeWidget(TranslationBase.of(context).myPrescription, HomePrescriptionsPage()),
Container( Container(
margin: EdgeInsets.only(right: 10.0, left: 10.0), margin: EdgeInsets.only(right: 10.0, left: 10.0),
height: MediaQuery.of(context).size.height * 0.18, height: MediaQuery.of(context).size.height * 0.28,
child: ListView.builder( child: ListView.builder(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
shrinkWrap: true, shrinkWrap: true,
@ -57,7 +63,7 @@ class PrescriptionsWidget extends StatelessWidget {
top: 10.0, top: 10.0,
left: 10.0, left: 10.0,
right: 10.0, right: 10.0,
bottom: 15.0, bottom: 10.0,
), ),
child: CircleAvatar( child: CircleAvatar(
radius: 30, radius: 30,
@ -79,7 +85,7 @@ class PrescriptionsWidget extends StatelessWidget {
border: Border.all( border: Border.all(
color: Colors.green, color: Colors.green,
style: BorderStyle.solid, style: BorderStyle.solid,
width: 4.0, width: 3.0,
), ),
color: Colors.green, color: Colors.green,
borderRadius: BorderRadius.circular(30.0)), borderRadius: BorderRadius.circular(30.0)),
@ -179,7 +185,8 @@ class PrescriptionsWidget extends StatelessWidget {
), ),
), ),
) )
: Container(), : Container(
),
); );
} }
} }

@ -1,6 +1,8 @@
import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacy_categorise_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacy_categorise_view_model.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/product-detail.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/product-detail.dart';
// import 'package:diplomaticquarterapp/pages/pharmacies/product_detail.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
@ -10,6 +12,7 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_pharmacy_widget
import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart'; import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'base/base_view.dart'; import 'base/base_view.dart';
@ -55,6 +58,22 @@ class _SearchProductsPageState extends State<SearchProductsPage> {
fontSize: 14.5, fontSize: 14.5,
prefixIcon: Icon(Icons.search), prefixIcon: Icon(Icons.search),
inputAction: TextInputAction.search, inputAction: TextInputAction.search,
inputFormatters: <TextInputFormatter>[
FilteringTextInputFormatter.deny(
RegExp("[\u0621-\u064a-\ ]"))
],
validator: (value) {
RegExp regExp = RegExp('[\u0621-\u064a-\ ]');
if (value.isEmpty) {
TranslationBase.of(context)
.pleaseEnterProductName;
} else if (regExp.hasMatch(value)) {
AppToast.showErrorToast(
message: TranslationBase.of(context)
.noArabicLetters);
}
return null;
},
onSaved: (value) { onSaved: (value) {
//searchMedicine(model, context); //searchMedicine(model, context);
}, },
@ -64,13 +83,13 @@ class _SearchProductsPageState extends State<SearchProductsPage> {
msg = TranslationBase.of(context).noResultFound; msg = TranslationBase.of(context).noResultFound;
}, },
controller: textController, controller: textController,
validator: (value) { // validator: (value) {
if (value.isEmpty) { // if (value.isEmpty) {
// return 'please Enter Product Name'; //// return 'please Enter Product Name';
return TranslationBase.of(context).pleaseEnterProductName; // return TranslationBase.of(context).pleaseEnterProductName;
} // }
return null; // return null;
}, // },
), ),
), ),
), ),

@ -3,7 +3,7 @@ import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacy_categorise_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacy_categorise_view_model.dart';
import 'package:diplomaticquarterapp/locator.dart'; import 'package:diplomaticquarterapp/locator.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-order-page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-page/cart-order-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/product-detail.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/product-details/product-detail.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
@ -987,9 +987,9 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
], ],
), ),
Container( Container(
height: 100.0, height: 130.0,
margin: EdgeInsets.symmetric( margin: EdgeInsets.symmetric(
horizontal: 6, horizontal: 0,
vertical: 0, vertical: 0,
), ),
child: Column( child: Column(

@ -1767,6 +1767,10 @@ class TranslationBase {
String get outOfStockMsg => localizedValues['outOfStockMsg'][locale.languageCode]; String get outOfStockMsg => localizedValues['outOfStockMsg'][locale.languageCode];
String get noArabicLetters => localizedValues['noArabicLetters'][locale.languageCode];
String get noOffersAvailable => localizedValues['noOffersAvailable'][locale.languageCode];
String get requestID => localizedValues['requestID'][locale.languageCode]; String get requestID => localizedValues['requestID'][locale.languageCode];
String get OrderStatus => localizedValues['OrderStatus'][locale.languageCode]; String get OrderStatus => localizedValues['OrderStatus'][locale.languageCode];

@ -1,6 +1,6 @@
import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/product_detail_view_model.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-order-page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/cart-page/cart-order-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/order/ProductReview.dart'; import 'package:diplomaticquarterapp/pages/pharmacy/order/ProductReview.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';

Loading…
Cancel
Save