Merge branch 'development' into Haroon

merge-update-with-lab-changes
haroon amjad 5 years ago
commit d8e11f7187

@ -1,3 +1,5 @@
import 'package:google_maps_flutter/google_maps_flutter.dart';
class BillingAddress { class BillingAddress {
String id; String id;
String firstName; String firstName;
@ -81,4 +83,19 @@ class BillingAddress {
data['lat_long'] = this.latLong; data['lat_long'] = this.latLong;
return data; return data;
} }
LatLng getLocation(){
if(latLong.contains(',')){
var parts = latLong.trim().split(',');
if(parts.length == 2){
var lat = double.tryParse(parts.first);
var lng = double.tryParse(parts.last);
if(lat != null || lng != null) {
var location = LatLng(lat, lng);
return location;
}
}
}
return null;
}
} }

@ -32,6 +32,7 @@ class Customer {
String lastLoginDateUtc; String lastLoginDateUtc;
String lastActivityDateUtc; String lastActivityDateUtc;
int registeredInStoreId; int registeredInStoreId;
List<int> roleIds;
Customer( Customer(
{this.billingAddress, {this.billingAddress,
@ -63,7 +64,8 @@ class Customer {
this.createdOnUtc, this.createdOnUtc,
this.lastLoginDateUtc, this.lastLoginDateUtc,
this.lastActivityDateUtc, this.lastActivityDateUtc,
this.registeredInStoreId}); this.registeredInStoreId,
this.roleIds});
Customer.fromJson(Map<String, dynamic> json) { Customer.fromJson(Map<String, dynamic> json) {
billingAddress = json['billing_address'] != null billingAddress = json['billing_address'] != null
@ -105,6 +107,7 @@ class Customer {
lastLoginDateUtc = json['last_login_date_utc']; lastLoginDateUtc = json['last_login_date_utc'];
lastActivityDateUtc = json['last_activity_date_utc']; lastActivityDateUtc = json['last_activity_date_utc'];
registeredInStoreId = json['registered_in_store_id']; registeredInStoreId = json['registered_in_store_id'];
roleIds = json['role_ids'].cast<int>();
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -145,6 +148,7 @@ class Customer {
data['last_login_date_utc'] = this.lastLoginDateUtc; data['last_login_date_utc'] = this.lastLoginDateUtc;
data['last_activity_date_utc'] = this.lastActivityDateUtc; data['last_activity_date_utc'] = this.lastActivityDateUtc;
data['registered_in_store_id'] = this.registeredInStoreId; data['registered_in_store_id'] = this.registeredInStoreId;
data['role_ids'] = this.roleIds;
return data; return data;
} }
} }

@ -7,22 +7,33 @@ class ShoppingCart {
// List<Null> productAttributes; // List<Null> productAttributes;
double customerEnteredPrice; double customerEnteredPrice;
int quantity; int quantity;
String discountAmountInclTax; dynamic discountAmountInclTax;
String subtotal; dynamic subtotal;
String subtotalWithVat; dynamic subtotalWithVat;
String subtotalVatAmount; dynamic subtotalVatAmount;
String subtotalVatRate; dynamic subtotalVatRate;
String currency; dynamic currency;
String currencyn; dynamic currencyn;
String rentalStartDateUtc; dynamic rentalStartDateUtc;
String rentalEndDateUtc; dynamic rentalEndDateUtc;
String createdOnUtc; dynamic createdOnUtc;
String updatedOnUtc; dynamic updatedOnUtc;
String shoppingCartType; dynamic shoppingCartType;
int productId; int productId;
PharmacyProduct product; PharmacyProduct product;
int customerId; int customerId;
Customer customer; Customer customer;
double unitPriceInclTax;
double unitPriceExclTax;
double priceInclTax;
double priceExclTax;
dynamic discountAmountExclTax;
double originalProductCost;
String attributeDescription;
int downloadCount;
bool isDownloadActivated;
int licenseDownloadId;
double itemWeight;
ShoppingCart( ShoppingCart(
{this.languageId, {this.languageId,
@ -45,7 +56,19 @@ class ShoppingCart {
this.productId, this.productId,
this.product, this.product,
this.customerId, this.customerId,
this.customer}); this.customer,
this.unitPriceInclTax,
this.unitPriceExclTax,
this.priceInclTax,
this.priceExclTax,
this.discountAmountExclTax,
this.originalProductCost,
this.attributeDescription,
this.downloadCount,
this.isDownloadActivated,
this.licenseDownloadId,
this.itemWeight,
});
ShoppingCart.fromJson(Map<String, dynamic> json) { ShoppingCart.fromJson(Map<String, dynamic> json) {
languageId = json['language_id']; languageId = json['language_id'];
@ -78,6 +101,18 @@ class ShoppingCart {
customer = json['customer'] != null customer = json['customer'] != null
? new Customer.fromJson(json['customer']) ? new Customer.fromJson(json['customer'])
: null; : null;
unitPriceInclTax = json['unit_price_incl_tax'];
unitPriceExclTax = json['unit_price_excl_tax'];
priceInclTax = json['price_incl_tax'];
priceExclTax = json['price_excl_tax'];
discountAmountExclTax = json['discount_amount_excl_tax'];
originalProductCost = json['original_product_cost'];
attributeDescription = json['attribute_description'];
downloadCount = json['download_count'];
isDownloadActivated = json['isDownload_activated'];
licenseDownloadId = json['license_download_id'];
itemWeight = json['item_weight'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -110,6 +145,18 @@ class ShoppingCart {
if (this.customer != null) { if (this.customer != null) {
data['customer'] = this.customer.toJson(); data['customer'] = this.customer.toJson();
} }
data['unit_price_incl_tax'] = this.unitPriceInclTax;
data['unit_price_excl_tax'] = this.unitPriceExclTax;
data['price_incl_tax'] = this.priceInclTax;
data['price_excl_tax'] = this.priceExclTax;
data['discount_amount_excl_tax'] = this.discountAmountExclTax;
data['original_product_cost'] = this.originalProductCost;
data['attribute_description'] = this.attributeDescription;
data['download_count'] = this.downloadCount;
data['isDownload_activated'] = this.isDownloadActivated;
data['license_download_id'] = this.licenseDownloadId;
data['item_weight'] = this.itemWeight;
return data; return data;
} }
} }

@ -0,0 +1,297 @@
import 'package:diplomaticquarterapp/core/model/pharmacies/BillingAddress.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/Customer.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/ShoppingCart.dart';
class OrderDetailModel {
String id;
int storeId;
String orderGuid;
bool pickUpInStore;
String paymentMethodSystemName;
String paymentName;
String paymentNamen;
String customerCurrencyCode;
dynamic currencyRate;
dynamic customerTaxDisplayTypeId;
dynamic vatNumber;
double orderSubtotalInclTax;
double orderSubtotalExclTax;
dynamic orderSubTotalDiscountInclTax;
dynamic orderSubTotalDiscountExclTax;
double orderShippingInclTax;
dynamic orderShippingExclTax;
dynamic paymentMethodAdditionalFeeInclTax;
dynamic paymentMethodAdditionalFeeExclTax;
String taxRates;
double orderTax;
dynamic orderDiscount;
dynamic productCount;
dynamic orderTotal;
dynamic refundedAmount;
dynamic rewardPointsWereAdded;
dynamic rxAttachments;
String checkoutAttributeDescription;
int customerLanguageId;
int affiliateId;
String customerIp;
dynamic authorizationTransactionId;
dynamic authorizationTransactionCode;
dynamic authorizationTransactionResult;
dynamic captureTransactionId;
dynamic captureTransactionResult;
dynamic subscriptionTransactionId;
dynamic paidDateUtc;
String shippingMethod;
String shippingRateComputationMethodSystemName;
String customValuesXml;
bool deleted;
String createdOnUtc;
Customer customer;
int customerId;
BillingAddress billingAddress;
BillingAddress shippingAddress;
List<ShoppingCart> orderItems;
int orderStatusId;
String orderStatus;
String orderStatusn;
int paymentStatusId;
String paymentStatus;
String paymentStatusn;
String shippingStatus;
String shippingStatusn;
String customerTaxDisplayType;
bool canCancel;
bool canRefund;
dynamic lakumAmount;
String preferDeliveryDate;
String preferDeliveryTime;
String preferDeliveryTimen;
OrderDetailModel(
{this.id,
this.storeId,
this.orderGuid,
this.pickUpInStore,
this.paymentMethodSystemName,
this.paymentName,
this.paymentNamen,
this.customerCurrencyCode,
this.currencyRate,
this.customerTaxDisplayTypeId,
this.vatNumber,
this.orderSubtotalInclTax,
this.orderSubtotalExclTax,
this.orderSubTotalDiscountInclTax,
this.orderSubTotalDiscountExclTax,
this.orderShippingInclTax,
this.orderShippingExclTax,
this.paymentMethodAdditionalFeeInclTax,
this.paymentMethodAdditionalFeeExclTax,
this.taxRates,
this.orderTax,
this.orderDiscount,
this.productCount,
this.orderTotal,
this.refundedAmount,
this.rewardPointsWereAdded,
this.rxAttachments,
this.checkoutAttributeDescription,
this.customerLanguageId,
this.affiliateId,
this.customerIp,
this.authorizationTransactionId,
this.authorizationTransactionCode,
this.authorizationTransactionResult,
this.captureTransactionId,
this.captureTransactionResult,
this.subscriptionTransactionId,
this.paidDateUtc,
this.shippingMethod,
this.shippingRateComputationMethodSystemName,
this.customValuesXml,
this.deleted,
this.createdOnUtc,
this.customer,
this.customerId,
this.billingAddress,
this.shippingAddress,
this.orderItems,
this.orderStatusId,
this.orderStatus,
this.orderStatusn,
this.paymentStatusId,
this.paymentStatus,
this.paymentStatusn,
this.shippingStatus,
this.shippingStatusn,
this.customerTaxDisplayType,
this.canCancel,
this.canRefund,
this.lakumAmount,
this.preferDeliveryDate,
this.preferDeliveryTime,
this.preferDeliveryTimen});
OrderDetailModel.fromJson(Map<String, dynamic> json) {
id = json['id'];
storeId = json['store_id'];
orderGuid = json['order_guid'];
pickUpInStore = json['pick_up_in_store'];
paymentMethodSystemName = json['payment_method_system_name'];
paymentName = json['payment_name'];
paymentNamen = json['payment_namen'];
customerCurrencyCode = json['customer_currency_code'];
currencyRate = json['currency_rate'];
customerTaxDisplayTypeId = json['customer_tax_display_type_id'];
vatNumber = json['vat_number'];
orderSubtotalInclTax = json['order_subtotal_incl_tax'];
orderSubtotalExclTax = json['order_subtotal_excl_tax'];
orderSubTotalDiscountInclTax = json['order_sub_total_discount_incl_tax'];
orderSubTotalDiscountExclTax = json['order_sub_total_discount_excl_tax'];
orderShippingInclTax = json['order_shipping_incl_tax'];
orderShippingExclTax = json['order_shipping_excl_tax'];
paymentMethodAdditionalFeeInclTax =
json['payment_method_additional_fee_incl_tax'];
paymentMethodAdditionalFeeExclTax =
json['payment_method_additional_fee_excl_tax'];
taxRates = json['tax_rates'];
orderTax = json['order_tax'];
orderDiscount = json['order_discount'];
productCount = json['product_count'];
orderTotal = json['order_total'];
refundedAmount = json['refunded_amount'];
rewardPointsWereAdded = json['reward_points_were_added'];
rxAttachments = json['rx_attachments'];
checkoutAttributeDescription = json['checkout_attribute_description'];
customerLanguageId = json['customer_language_id'];
affiliateId = json['affiliate_id'];
customerIp = json['customer_ip'];
authorizationTransactionId = json['authorization_transaction_id'];
authorizationTransactionCode = json['authorization_transaction_code'];
authorizationTransactionResult = json['authorization_transaction_result'];
captureTransactionId = json['capture_transaction_id'];
captureTransactionResult = json['capture_transaction_result'];
subscriptionTransactionId = json['subscription_transaction_id'];
paidDateUtc = json['paid_date_utc'];
shippingMethod = json['shipping_method'];
shippingRateComputationMethodSystemName =
json['shipping_rate_computation_method_system_name'];
customValuesXml = json['custom_values_xml'];
deleted = json['deleted'];
createdOnUtc = json['created_on_utc'];
customer = json['customer'] != null
? new Customer.fromJson(json['customer'])
: null;
customerId = json['customer_id'];
billingAddress = json['billing_address'] != null
? new BillingAddress.fromJson(json['billing_address'])
: null;
shippingAddress = json['shipping_address'] != null
? new BillingAddress.fromJson(json['shipping_address'])
: null;
if (json['order_items'] != null) {
orderItems = new List<ShoppingCart>();
json['order_items'].forEach((v) {
orderItems.add(new ShoppingCart.fromJson(v));
});
}
orderStatusId = json['order_status_id'];
orderStatus = json['order_status'];
orderStatusn = json['order_statusn'];
paymentStatusId = json['payment_status_id'];
paymentStatus = json['payment_status'];
paymentStatusn = json['payment_statusn'];
shippingStatus = json['shipping_status'];
shippingStatusn = json['shipping_statusn'];
customerTaxDisplayType = json['customer_tax_display_type'];
canCancel = json['can_cancel'];
canRefund = json['can_refund'];
lakumAmount = json['lakum_amount'];
preferDeliveryDate = json['prefer_delivery_date'];
preferDeliveryTime = json['prefer_delivery_time'];
preferDeliveryTimen = json['prefer_delivery_timen'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['store_id'] = this.storeId;
data['order_guid'] = this.orderGuid;
data['pick_up_in_store'] = this.pickUpInStore;
data['payment_method_system_name'] = this.paymentMethodSystemName;
data['payment_name'] = this.paymentName;
data['payment_namen'] = this.paymentNamen;
data['customer_currency_code'] = this.customerCurrencyCode;
data['currency_rate'] = this.currencyRate;
data['customer_tax_display_type_id'] = this.customerTaxDisplayTypeId;
data['vat_number'] = this.vatNumber;
data['order_subtotal_incl_tax'] = this.orderSubtotalInclTax;
data['order_subtotal_excl_tax'] = this.orderSubtotalExclTax;
data['order_sub_total_discount_incl_tax'] =
this.orderSubTotalDiscountInclTax;
data['order_sub_total_discount_excl_tax'] =
this.orderSubTotalDiscountExclTax;
data['order_shipping_incl_tax'] = this.orderShippingInclTax;
data['order_shipping_excl_tax'] = this.orderShippingExclTax;
data['payment_method_additional_fee_incl_tax'] =
this.paymentMethodAdditionalFeeInclTax;
data['payment_method_additional_fee_excl_tax'] =
this.paymentMethodAdditionalFeeExclTax;
data['tax_rates'] = this.taxRates;
data['order_tax'] = this.orderTax;
data['order_discount'] = this.orderDiscount;
data['product_count'] = this.productCount;
data['order_total'] = this.orderTotal;
data['refunded_amount'] = this.refundedAmount;
data['reward_points_were_added'] = this.rewardPointsWereAdded;
data['rx_attachments'] = this.rxAttachments;
data['checkout_attribute_description'] = this.checkoutAttributeDescription;
data['customer_language_id'] = this.customerLanguageId;
data['affiliate_id'] = this.affiliateId;
data['customer_ip'] = this.customerIp;
data['authorization_transaction_id'] = this.authorizationTransactionId;
data['authorization_transaction_code'] = this.authorizationTransactionCode;
data['authorization_transaction_result'] =
this.authorizationTransactionResult;
data['capture_transaction_id'] = this.captureTransactionId;
data['capture_transaction_result'] = this.captureTransactionResult;
data['subscription_transaction_id'] = this.subscriptionTransactionId;
data['paid_date_utc'] = this.paidDateUtc;
data['shipping_method'] = this.shippingMethod;
data['shipping_rate_computation_method_system_name'] =
this.shippingRateComputationMethodSystemName;
data['custom_values_xml'] = this.customValuesXml;
data['deleted'] = this.deleted;
data['created_on_utc'] = this.createdOnUtc;
if (this.customer != null) {
data['customer'] = this.customer.toJson();
}
data['customer_id'] = this.customerId;
if (this.billingAddress != null) {
data['billing_address'] = this.billingAddress.toJson();
}
if (this.shippingAddress != null) {
data['shipping_address'] = this.shippingAddress.toJson();
}
if (this.orderItems != null) {
data['order_items'] = this.orderItems.map((v) => v.toJson()).toList();
}
data['order_status_id'] = this.orderStatusId;
data['order_status'] = this.orderStatus;
data['order_statusn'] = this.orderStatusn;
data['payment_status_id'] = this.paymentStatusId;
data['payment_status'] = this.paymentStatus;
data['payment_statusn'] = this.paymentStatusn;
data['shipping_status'] = this.shippingStatus;
data['shipping_statusn'] = this.shippingStatusn;
data['customer_tax_display_type'] = this.customerTaxDisplayType;
data['can_cancel'] = this.canCancel;
data['can_refund'] = this.canRefund;
data['lakum_amount'] = this.lakumAmount;
data['prefer_delivery_date'] = this.preferDeliveryDate;
data['prefer_delivery_time'] = this.preferDeliveryTime;
data['prefer_delivery_timen'] = this.preferDeliveryTimen;
return data;
}
}

@ -9,6 +9,71 @@ List<OrderModel> orderModelFromJson(String str) => List<OrderModel>.from(json.de
String orderModelToJson(List<OrderModel> data) => json.encode(List<dynamic>.from(data.map((x) => x.toJson()))); String orderModelToJson(List<OrderModel> data) => json.encode(List<dynamic>.from(data.map((x) => x.toJson())));
class OrderModel { class OrderModel {
String id;
dynamic storeId;
String orderGuid;
bool pickUpInStore;
PaymentMethodSystemName paymentMethodSystemName;
PaymentName paymentName;
PaymentName paymentNamen;
CustomerCurrencyCode customerCurrencyCode;
dynamic currencyRate;
dynamic customerTaxDisplayTypeId;
dynamic vatNumber;
double orderSubtotalInclTax;
double orderSubtotalExclTax;
dynamic orderSubTotalDiscountInclTax;
dynamic orderSubTotalDiscountExclTax;
double orderShippingInclTax;
dynamic orderShippingExclTax;
dynamic paymentMethodAdditionalFeeInclTax;
dynamic paymentMethodAdditionalFeeExclTax;
String taxRates;
double orderTax;
dynamic orderDiscount;
dynamic productCount;
double orderTotal;
dynamic refundedAmount;
dynamic rewardPointsWereAdded;
String rxAttachments;
CheckoutAttributeDescription checkoutAttributeDescription;
dynamic customerLanguageId;
dynamic affiliateId;
CustomerIp customerIp;
String authorizationTransactionId;
dynamic authorizationTransactionCode;
dynamic authorizationTransactionResult;
dynamic captureTransactionId;
dynamic captureTransactionResult;
dynamic subscriptionTransactionId;
DateTime paidDateUtc;
ShippingMethod shippingMethod;
ShippingRateComputationMethodSystemName shippingRateComputationMethodSystemName;
String customValuesXml;
bool deleted;
DateTime createdOnUtc;
OrderModelCustomer customer;
dynamic customerId;
IngAddress billingAddress;
IngAddress shippingAddress;
List<OrderItem> orderItems;
dynamic orderStatusId;
OrderStatus orderStatus;
OrderStatusn orderStatusn;
dynamic paymentStatusId;
PaymentStatus paymentStatus;
PaymentStatusn paymentStatusn;
ShippingStatus shippingStatus;
ShippingStatusn shippingStatusn;
CustomerTaxDisplayType customerTaxDisplayType;
bool canCancel;
bool canRefund;
dynamic lakumAmount;
DateTime preferDeliveryDate;
PreferDeliveryTime preferDeliveryTime;
PreferDeliveryTimen preferDeliveryTimen;
OrderModel({ OrderModel({
this.id, this.id,
this.storeId, this.storeId,
@ -75,70 +140,6 @@ class OrderModel {
this.preferDeliveryTimen, this.preferDeliveryTimen,
}); });
String id;
dynamic storeId;
String orderGuid;
bool pickUpInStore;
PaymentMethodSystemName paymentMethodSystemName;
PaymentName paymentName;
PaymentName paymentNamen;
CustomerCurrencyCode customerCurrencyCode;
dynamic currencyRate;
dynamic customerTaxDisplayTypeId;
dynamic vatNumber;
double orderSubtotalInclTax;
double orderSubtotalExclTax;
dynamic orderSubTotalDiscountInclTax;
dynamic orderSubTotalDiscountExclTax;
double orderShippingInclTax;
dynamic orderShippingExclTax;
dynamic paymentMethodAdditionalFeeInclTax;
dynamic paymentMethodAdditionalFeeExclTax;
String taxRates;
double orderTax;
dynamic orderDiscount;
dynamic productCount;
double orderTotal;
dynamic refundedAmount;
dynamic rewardPointsWereAdded;
String rxAttachments;
CheckoutAttributeDescription checkoutAttributeDescription;
dynamic customerLanguageId;
dynamic affiliateId;
CustomerIp customerIp;
String authorizationTransactionId;
dynamic authorizationTransactionCode;
dynamic authorizationTransactionResult;
dynamic captureTransactionId;
dynamic captureTransactionResult;
dynamic subscriptionTransactionId;
DateTime paidDateUtc;
ShippingMethod shippingMethod;
ShippingRateComputationMethodSystemName shippingRateComputationMethodSystemName;
String customValuesXml;
bool deleted;
DateTime createdOnUtc;
OrderModelCustomer customer;
dynamic customerId;
IngAddress billingAddress;
IngAddress shippingAddress;
List<OrderItem> orderItems;
dynamic orderStatusId;
OrderStatus orderStatus;
OrderStatusn orderStatusn;
dynamic paymentStatusId;
PaymentStatus paymentStatus;
PaymentStatusn paymentStatusn;
ShippingStatus shippingStatus;
ShippingStatusn shippingStatusn;
CustomerTaxDisplayType customerTaxDisplayType;
bool canCancel;
bool canRefund;
dynamic lakumAmount;
DateTime preferDeliveryDate;
PreferDeliveryTime preferDeliveryTime;
PreferDeliveryTimen preferDeliveryTimen;
factory OrderModel.fromJson(Map<String, dynamic> json) => OrderModel( factory OrderModel.fromJson(Map<String, dynamic> json) => OrderModel(
id: json["id"], id: json["id"],
storeId: json["store_id"], storeId: json["store_id"],
@ -1470,6 +1471,3 @@ class EnumValues<T> {
return reverseMap; return reverseMap;
} }
} }

@ -1,4 +1,6 @@
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart';
import 'package:diplomaticquarterapp/core/model/pharmacy/brands_model.dart'; import 'package:diplomaticquarterapp/core/model/pharmacy/brands_model.dart';
import 'package:diplomaticquarterapp/core/model/pharmacy/categorise_parent_model.dart'; import 'package:diplomaticquarterapp/core/model/pharmacy/categorise_parent_model.dart';
import 'package:diplomaticquarterapp/core/model/pharmacy/final_products_model.dart'; import 'package:diplomaticquarterapp/core/model/pharmacy/final_products_model.dart';
@ -21,20 +23,20 @@ class PharmacyCategoriseService extends BaseService {
List<CategoriseParentModel> get parentCategoriseList => _parentCategoriseList; List<CategoriseParentModel> get parentCategoriseList => _parentCategoriseList;
//service three //service three
List<ParentProductsModel> _parentProductsList = List(); List<PharmacyProduct> _parentProductsList = List();
List<ParentProductsModel> get parentProductsList => _parentProductsList; List<PharmacyProduct> get parentProductsList => _parentProductsList;
//service four //service four
List<SubCategoriesModel> _subCategoriseList = List(); List<SubCategoriesModel> _subCategoriseList = List();
List<SubCategoriesModel> get subCategoriseList => _subCategoriseList; List<SubCategoriesModel> get subCategoriseList => _subCategoriseList;
//service five //service five
List<SubProductsModel> _subProductsList = List(); List<PharmacyProduct> _subProductsList = List();
List<SubProductsModel> get subProductsList => _subProductsList; List<PharmacyProduct> get subProductsList => _subProductsList;
//service six //service six
List<FinalProductsModel> _finalProducts = List(); List<PharmacyProduct> _finalProducts = List();
List<FinalProductsModel> get finalProducts => _finalProducts; List<PharmacyProduct> get finalProducts => _finalProducts;
//service 7 //service 7
@ -43,8 +45,8 @@ class PharmacyCategoriseService extends BaseService {
// service 8 // service 8
List<SearchProductsModel> _searchList = List(); List<PharmacyProduct> _searchList = List();
List<SearchProductsModel> get searchList => _searchList; List<PharmacyProduct> get searchList => _searchList;
List<ScanQrModel> _scanList = List(); List<ScanQrModel> _scanList = List();
List<ScanQrModel> get scanList => _scanList; List<ScanQrModel> get scanList => _scanList;
@ -100,7 +102,7 @@ class PharmacyCategoriseService extends BaseService {
endPoint, endPoint,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
response['products'].forEach((item) { response['products'].forEach((item) {
_searchList.add(SearchProductsModel.fromJson(item)); _searchList.add(PharmacyProduct.fromJson(item));
}); });
}, },
onFailure: (String error, int statusCode) { onFailure: (String error, int statusCode) {
@ -156,7 +158,7 @@ class PharmacyCategoriseService extends BaseService {
endPoint, endPoint,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
response['products'].forEach((item) { response['products'].forEach((item) {
_parentProductsList.add(ParentProductsModel.fromJson(item)); _parentProductsList.add(PharmacyProduct.fromJson(item));
}); });
}, },
onFailure: (String error, int statusCode) { onFailure: (String error, int statusCode) {
@ -196,7 +198,7 @@ class PharmacyCategoriseService extends BaseService {
endPoint, endPoint,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
response['products'].forEach((item) { response['products'].forEach((item) {
_subProductsList.add(SubProductsModel.fromJson(item)); _subProductsList.add(PharmacyProduct.fromJson(item));
}); });
}, },
onFailure: (String error, int statusCode) { onFailure: (String error, int statusCode) {
@ -215,7 +217,7 @@ class PharmacyCategoriseService extends BaseService {
endPoint, endPoint,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
response['products'].forEach((item) { response['products'].forEach((item) {
_finalProducts.add(FinalProductsModel.fromJson(item)); _finalProducts.add(PharmacyProduct.fromJson(item));
}); });
}, },
onFailure: (String error, int statusCode) { onFailure: (String error, int statusCode) {
@ -229,18 +231,64 @@ class PharmacyCategoriseService extends BaseService {
hasError = false; hasError = false;
Map<String, String> queryParams = {'ManufacturerId': id}; Map<String, String> queryParams = {'ManufacturerId': id};
manufacturerProducts.clear(); _finalProducts.clear();
await baseAppClient.getPharmacy( await baseAppClient.getPharmacy(
GET_BRAND_ITEMS, GET_BRAND_ITEMS,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
response['products'].forEach((item) { response['products'].forEach((item) {
manufacturerProducts.add(FinalProductsModel.fromJson(item)); _finalProducts.add(PharmacyProduct.fromJson(item));
}); });
}, },
onFailure: (String error, int statusCode) { onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, queryParams: queryParams, },
queryParams: queryParams,
); );
} }
Future getLastVisitedProducts() async {
String lastVisited = "";
if (await this.sharedPref.getString(PHARMACY_LAST_VISITED_PRODUCTS) !=
null) {
lastVisited =
await this.sharedPref.getString(PHARMACY_LAST_VISITED_PRODUCTS);
try {
await baseAppClient
.getPharmacy("$GET_PHARMACY_PRODUCTs_BY_IDS$lastVisited",
onSuccess: (dynamic response, int statusCode) {
_finalProducts.clear();
response['products'].forEach((item) {
_finalProducts.add(PharmacyProduct.fromJson(item));
});
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
});
} catch (error) {
throw error;
}
}
}
Future getBestSellerProducts() async {
Map<String, String> queryParams = {
'fields':
'id,discount_ids,name,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage,reviews',
};
try {
await baseAppClient.getPharmacy(GET_PHARMACY_BEST_SELLER_PRODUCT,
onSuccess: (dynamic response, int statusCode) {
_finalProducts.clear();
response['products'].forEach((item) {
_finalProducts.add(PharmacyProduct.fromJson(item));
});
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, queryParams: queryParams);
} catch (error) {
throw error;
}
}
} }

@ -185,7 +185,7 @@ class OrderPreviewViewModel extends BaseViewModel {
await _orderService.makeOrder(paymentCheckoutData, cartResponse.shoppingCarts); await _orderService.makeOrder(paymentCheckoutData, cartResponse.shoppingCarts);
if (_orderService.hasError) { if (_orderService.hasError) {
error = _orderService.error; error = _orderService.error;
setState(ViewState.Error); setState(ViewState.ErrorLocal);
} else { } else {
setState(ViewState.Idle); setState(ViewState.Idle);
} }

@ -1,18 +1,17 @@
import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/LacumAccountInformation.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/LacumAccountInformation.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/ShoppingCartResponse.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/ShoppingCartResponse.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/order_detail.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/payment-checkout-data.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/payment-checkout-data.dart';
import 'package:diplomaticquarterapp/core/service/parmacyModule/order-preview-service.dart'; import 'package:diplomaticquarterapp/core/service/parmacyModule/order-preview-service.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/order/Order.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/order/OrderDetails.dart';
import 'package:diplomaticquarterapp/services/pharmacy_services/cancelOrder_service.dart'; import 'package:diplomaticquarterapp/services/pharmacy_services/cancelOrder_service.dart';
import 'package:diplomaticquarterapp/services/pharmacy_services/orderDetails_service.dart'; import 'package:diplomaticquarterapp/services/pharmacy_services/orderDetails_service.dart';
import 'package:diplomaticquarterapp/services/pharmacy_services/order_service.dart'; import 'package:diplomaticquarterapp/services/pharmacy_services/order_service.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/order_model.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/order_model.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/orders_model.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/orders_model.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:flutter/material.dart';
import '../../../locator.dart'; import '../../../locator.dart';
import '../base_view_model.dart'; import '../base_view_model.dart';
@ -21,10 +20,10 @@ class OrderModelViewModel extends BaseViewModel {
List<Orders> get orders => _orderService.orderList; List<Orders> get orders => _orderService.orderList;
OrderDetailsService _orderDetailsService = locator<OrderDetailsService>(); OrderDetailsService _orderDetailsService = locator<OrderDetailsService>();
List<OrderModel> get orderListModel => _orderDetailsService.orderList; List<OrderDetailModel> get orderListModel => _orderDetailsService.orderList;
CancelOrderService _cancelOrderService = locator<CancelOrderService>(); CancelOrderService _cancelOrderService = locator<CancelOrderService>();
List<OrderModel> get cancelOrder => _cancelOrderService.cancelOrderList; List<OrderDetailModel> get cancelOrder => _cancelOrderService.cancelOrderList;
OrderPreviewService _orderServices = locator<OrderPreviewService>(); OrderPreviewService _orderServices = locator<OrderPreviewService>();
@ -98,7 +97,7 @@ class OrderModelViewModel extends BaseViewModel {
return res; return res;
} }
Future makeReview(Product product, double rating, String reviewText) async { Future makeReview(PharmacyProduct product, double rating, String reviewText) async {
setState(ViewState.Busy); setState(ViewState.Busy);
await _orderDetailsService.makeReview(product, rating, reviewText); await _orderDetailsService.makeReview(product, rating, reviewText);
if (_orderDetailsService.hasError) { if (_orderDetailsService.hasError) {

@ -1,4 +1,5 @@
import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart';
import 'package:diplomaticquarterapp/core/model/pharmacy/brands_model.dart'; import 'package:diplomaticquarterapp/core/model/pharmacy/brands_model.dart';
import 'package:diplomaticquarterapp/core/model/pharmacy/categorise_parent_model.dart'; import 'package:diplomaticquarterapp/core/model/pharmacy/categorise_parent_model.dart';
import 'package:diplomaticquarterapp/core/model/pharmacy/final_products_model.dart'; import 'package:diplomaticquarterapp/core/model/pharmacy/final_products_model.dart';
@ -16,22 +17,29 @@ import 'base_view_model.dart';
class PharmacyCategoriseViewModel extends BaseViewModel { class PharmacyCategoriseViewModel extends BaseViewModel {
bool hasError = false; bool hasError = false;
PharmacyCategoriseService _pharmacyCategoriseService = locator<PharmacyCategoriseService>(); PharmacyCategoriseService _pharmacyCategoriseService =
locator<PharmacyCategoriseService>();
List<PharmacyCategorise> get categorise => _pharmacyCategoriseService.categoriseList; List<PharmacyCategorise> get categorise =>
_pharmacyCategoriseService.categoriseList;
List<CategoriseParentModel> get categoriseParent => _pharmacyCategoriseService.parentCategoriseList; List<CategoriseParentModel> get categoriseParent =>
_pharmacyCategoriseService.parentCategoriseList;
List<ParentProductsModel> get parentProducts => _pharmacyCategoriseService.parentProductsList; List<PharmacyProduct> get parentProducts =>
_pharmacyCategoriseService.parentProductsList;
List<SubCategoriesModel> get subCategorise => _pharmacyCategoriseService.subCategoriseList; List<SubCategoriesModel> get subCategorise =>
_pharmacyCategoriseService.subCategoriseList;
List<SubProductsModel> get subProducts => _pharmacyCategoriseService.subProductsList; List<PharmacyProduct> get subProducts =>
_pharmacyCategoriseService.subProductsList;
List<FinalProductsModel> get finalProducts => _pharmacyCategoriseService.finalProducts; List<PharmacyProduct> get finalProducts =>
_pharmacyCategoriseService.finalProducts;
List<BrandsModel> get brandsList => _pharmacyCategoriseService.brandsList; List<BrandsModel> get brandsList => _pharmacyCategoriseService.brandsList;
List<SearchProductsModel> get searchList => _pharmacyCategoriseService.searchList; List<PharmacyProduct> get searchList => _pharmacyCategoriseService.searchList;
List<ScanQrModel> get scanList => _pharmacyCategoriseService.scanList; List<ScanQrModel> get scanList => _pharmacyCategoriseService.scanList;
@ -158,4 +166,26 @@ class PharmacyCategoriseViewModel extends BaseViewModel {
setState(ViewState.Idle); setState(ViewState.Idle);
} }
} }
Future getLastVisitedProducts() async {
setState(ViewState.Busy);
await _pharmacyCategoriseService.getLastVisitedProducts();
if (_pharmacyCategoriseService.hasError) {
error = _pharmacyCategoriseService.error;
setState(ViewState.Error);
} else {
setState(ViewState.Idle);
}
}
Future getBestSellerProducts() async {
setState(ViewState.Busy);
await _pharmacyCategoriseService.getBestSellerProducts();
if (_pharmacyCategoriseService.hasError) {
error = _pharmacyCategoriseService.error;
setState(ViewState.Error);
} else {
setState(ViewState.Idle);
}
}
} }

@ -1,16 +1,18 @@
import 'package:diplomaticquarterapp/core/viewModels/pharmacy_categorise_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacy_categorise_view_model.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/product_detail.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';
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:flutter/material.dart'; import 'package:flutter/material.dart';
import 'base/base_view.dart'; import 'base/base_view.dart';
class FinalProductsPage extends StatefulWidget { class FinalProductsPage extends StatefulWidget {
final String id; final String id;
final int productType; final int productType; // 1 : default, 2 : manufacturer , 3 : recently viewed
FinalProductsPage({this.id, this.productType = 1}); FinalProductsPage({this.id, this.productType = 1});
@ -20,9 +22,7 @@ class FinalProductsPage extends StatefulWidget {
class _FinalProductsPageState extends State<FinalProductsPage> { class _FinalProductsPageState extends State<FinalProductsPage> {
String id; String id;
_FinalProductsPageState({this.id}); _FinalProductsPageState({this.id});
String categoriseName = "Personal Care"; String categoriseName = "Personal Care";
bool styleOne = true; bool styleOne = true;
bool styleTwo = false; bool styleTwo = false;
@ -31,13 +31,21 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
color: Colors.blue, color: Colors.blue,
size: 29.0, size: 29.0,
); );
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseView<PharmacyCategoriseViewModel>( return BaseView<PharmacyCategoriseViewModel>(
onModelReady: (model) => widget.productType == 1 onModelReady: (model) {
? model.getFinalProducts(i: id) if (widget.productType == 1) {
: model.getManufacturerProducts(id), model.getFinalProducts(i: id);
} else if (widget.productType == 2) {
model.getManufacturerProducts(id);
} else if (widget.productType == 3) {
model.getLastVisitedProducts();
} else {
model.getBestSellerProducts();
}
},
allowAny: true,
builder: (BuildContext context, PharmacyCategoriseViewModel model, builder: (BuildContext context, PharmacyCategoriseViewModel model,
Widget child) => Widget child) =>
PharmacyAppScaffold( PharmacyAppScaffold(
@ -126,6 +134,7 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return NetworkBaseView( return NetworkBaseView(
baseViewModel: model, baseViewModel: model,
child: InkWell(
child: Card( child: Card(
color: model.finalProducts[index] color: model.finalProducts[index]
.discountName != .discountName !=
@ -175,12 +184,17 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
Stack( Stack(
children: [ children: [
Container( Container(
margin: EdgeInsets.fromLTRB( margin:
EdgeInsets.fromLTRB(
0, 16, 0, 0), 0, 16, 0, 0),
alignment: Alignment.center, alignment:
Alignment.center,
child: Image.network( child: Image.network(
model.finalProducts[index] model
.images.isNotEmpty .finalProducts[
index]
.images
.isNotEmpty
? model ? model
.finalProducts[ .finalProducts[
index] index]
@ -197,21 +211,27 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
index] index]
.rxMessage != .rxMessage !=
null null
? MediaQuery.of(context) ? MediaQuery.of(
context)
.size .size
.width / .width /
2.8 2.8
: 0, : 0,
padding: EdgeInsets.all(4), padding:
EdgeInsets.all(4),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xffb23838), color:
Color(0xffb23838),
borderRadius: borderRadius:
BorderRadius.only( BorderRadius.only(
topLeft: Radius topLeft: Radius
.circular(6)), .circular(
6)),
), ),
child: Texts( child: Texts(
model.finalProducts[index] model
.finalProducts[
index]
.rxMessage != .rxMessage !=
null null
? model ? model
@ -235,7 +255,8 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
), ),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment
.start,
children: [ children: [
if (model if (model
.finalProducts[ .finalProducts[
@ -243,12 +264,13 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
.discountName != .discountName !=
null) null)
Container( Container(
width: double.infinity, width:
double.infinity,
height: 13.0, height: 13.0,
decoration: decoration:
BoxDecoration( BoxDecoration(
color: color: Color(
Color(0xff5AB145), 0xff5AB145),
), ),
child: Center( child: Center(
child: Texts( child: Texts(
@ -257,13 +279,16 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
index] index]
.discountName, .discountName,
regular: true, regular: true,
color: Colors.white, color:
Colors.white,
fontSize: 10.4, fontSize: 10.4,
), ),
), ),
), ),
Texts( Texts(
model.finalProducts[index] model
.finalProducts[
index]
.name, .name,
regular: true, regular: true,
fontSize: 12, fontSize: 12,
@ -272,7 +297,8 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
), ),
Padding( Padding(
padding: padding:
const EdgeInsets.only( const EdgeInsets
.only(
top: 4, top: 4,
bottom: 4), bottom: 4),
child: Texts( child: Texts(
@ -313,6 +339,15 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
], ],
), ),
), ),
),
onTap: () => {
Navigator.push(
context,
FadePage(
page: ProductDetailPage(
model.finalProducts[index]),
)),
},
)); ));
}, },
), ),
@ -325,7 +360,8 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
itemCount: model.finalProducts.length, itemCount: model.finalProducts.length,
itemBuilder: itemBuilder:
(BuildContext context, int index) { (BuildContext context, int index) {
return Card( return InkWell(
child: Card(
child: Row( child: Row(
children: [ children: [
Stack( Stack(
@ -333,9 +369,11 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
Column( Column(
children: [ children: [
Container( Container(
decoration: BoxDecoration(), decoration:
BoxDecoration(),
child: Padding( child: Padding(
padding: EdgeInsets.only( padding:
EdgeInsets.only(
left: 9.0, left: 9.0,
top: 8.0, top: 8.0,
right: 10.0, right: 10.0,
@ -343,12 +381,17 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
), ),
), ),
Container( Container(
margin: EdgeInsets.fromLTRB( margin:
EdgeInsets.fromLTRB(
0, 0, 0, 0), 0, 0, 0, 0),
alignment: Alignment.center, alignment:
Alignment.center,
child: Image.network( child: Image.network(
model.finalProducts[index] model
.images.isNotEmpty .finalProducts[
index]
.images
.isNotEmpty
? model ? model
.finalProducts[ .finalProducts[
index] index]
@ -369,21 +412,27 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
index] index]
.rxMessage != .rxMessage !=
null null
? MediaQuery.of(context) ? MediaQuery.of(
context)
.size .size
.width / .width /
3.5 3.5
: 0, : 0,
padding: EdgeInsets.all(4), padding:
EdgeInsets.all(4),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xffb23838), color:
Color(0xffb23838),
borderRadius: borderRadius:
BorderRadius.only( BorderRadius.only(
topLeft: Radius topLeft: Radius
.circular(6)), .circular(
6)),
), ),
child: Texts( child: Texts(
model.finalProducts[index] model
.finalProducts[
index]
.rxMessage != .rxMessage !=
null null
? model ? model
@ -410,7 +459,8 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
), ),
child: Column( child: Column(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceAround, MainAxisAlignment
.spaceAround,
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
@ -418,15 +468,19 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
height: 4.0, height: 4.0,
), ),
Container( Container(
height: 35.0, width:
width: 250.0, MediaQuery.of(context)
.size
.width *
0.65,
child: Texts( child: Texts(
model.finalProducts[index] model.finalProducts[index]
.name, .name,
regular: true, regular: true,
fontSize: 13.2, fontSize: 13.2,
fontWeight: FontWeight.w500, fontWeight:
maxLines: 2, FontWeight.w500,
maxLines: 5,
), ),
), ),
SizedBox( SizedBox(
@ -477,6 +531,15 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
), ),
], ],
), ),
),
onTap: () => {
Navigator.push(
context,
FadePage(
page: ProductDetailPage(
model.finalProducts[index]),
)),
},
); );
}), }),
), ),

@ -49,12 +49,8 @@ class _LandingPagePharmacyState extends State<LandingPagePharmacy> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: appBar: currentTab != 4
? AppBar(
// currentTab == 0 || currentTab == 1 || currentTab == 2
// ?
AppBar(
backgroundColor: Color(0xff5AB145), backgroundColor: Color(0xff5AB145),
elevation: 0, elevation: 0,
title: Container( title: Container(
@ -84,7 +80,8 @@ class _LandingPagePharmacyState extends State<LandingPagePharmacy> {
onTap: () { onTap: () {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => SearchProductsPage()), MaterialPageRoute(
builder: (context) => SearchProductsPage()),
); );
}, },
), ),
@ -118,9 +115,8 @@ class _LandingPagePharmacyState extends State<LandingPagePharmacy> {
) )
], ],
centerTitle: true, centerTitle: true,
), )
// : currentTab == 4 : null,
// ? null:null,
// : AppBar( // : AppBar(
// backgroundColor: Color(0xff5AB145), // backgroundColor: Color(0xff5AB145),
// elevation: 0, // elevation: 0,
@ -155,7 +151,6 @@ class _LandingPagePharmacyState extends State<LandingPagePharmacy> {
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
controller: pageController, controller: pageController,
children: [ children: [
// TODO mosa_comeback
PharmacyPage(), PharmacyPage(),
PharmacyCategorisePage(), PharmacyCategorisePage(),
// OffersCategorisePage(), // OffersCategorisePage(),
@ -180,7 +175,8 @@ class _LandingPagePharmacyState extends State<LandingPagePharmacy> {
try { try {
String barcode = result; String barcode = result;
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
await BaseAppClient().getPharmacy("$GET_PHARMACY_PRODUCTs_BY_SKU$barcode", await BaseAppClient()
.getPharmacy("$GET_PHARMACY_PRODUCTs_BY_SKU$barcode",
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
print(response); print(response);
var product = PharmacyProduct.fromJson(response["products"][0]); var product = PharmacyProduct.fromJson(response["products"][0]);

@ -39,7 +39,8 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
backgroundColor: Colors.white, backgroundColor: Colors.white,
isShowDecPage: false, isShowDecPage: false,
baseViewModel: model, baseViewModel: model,
body: Container( body: model.categorise.length != 0
? Container(
//height: MediaQuery.of(context).size.height * 0.57, //height: MediaQuery.of(context).size.height * 0.57,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -63,7 +64,8 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
child: ListView.builder( child: ListView.builder(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
itemCount: model.categorise.length, itemCount: model.categorise.length,
itemBuilder: (BuildContext context, int index) { itemBuilder:
(BuildContext context, int index) {
return Padding( return Padding(
padding: EdgeInsets.all(8.0), padding: EdgeInsets.all(8.0),
child: Row( child: Row(
@ -76,7 +78,8 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
width: 65.0, width: 65.0,
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.circle, shape: BoxShape.circle,
color: Colors.orange.shade200 color: Colors
.orange.shade200
.withOpacity(0.45), .withOpacity(0.45),
), ),
child: Icon( child: Icon(
@ -85,18 +88,22 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
), ),
), ),
Container( Container(
width: MediaQuery.of(context) width:
MediaQuery.of(context)
.size .size
.width * .width *
0.2, 0.2,
height: MediaQuery.of(context) height:
MediaQuery.of(context)
.size .size
.height * .height *
0.09, 0.09,
child: Center( child: Center(
child: Texts( child: Texts(
model.categorise[index].name, model.categorise[index]
fontWeight: FontWeight.w600, .name,
fontWeight:
FontWeight.w600,
fontSize: 13.8, fontSize: 13.8,
), ),
), ),
@ -105,11 +112,13 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
), ),
onTap: () { onTap: () {
model.getOffersProducts( model.getOffersProducts(
i: model.categorise[index].id); i: model
String ids = model.categorise[index].id; .categorise[index].id);
String ids =
model.categorise[index].id;
categoriseName = categoriseName = model
model.categorise[index].name; .categorise[index].name;
}), }),
], ],
), ),
@ -179,7 +188,9 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
styleOne == true styleOne == true
? Expanded( ? Expanded(
child: Container( child: Container(
height: MediaQuery.of(context).size.height * 0.50, height:
MediaQuery.of(context).size.height *
0.50,
child: GridView.builder( child: GridView.builder(
gridDelegate: gridDelegate:
SliverGridDelegateWithFixedCrossAxisCount( SliverGridDelegateWithFixedCrossAxisCount(
@ -189,7 +200,8 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
childAspectRatio: 0.85, childAspectRatio: 0.85,
), ),
itemCount: model.products.length, itemCount: model.products.length,
itemBuilder: (BuildContext context, int index) { itemBuilder:
(BuildContext context, int index) {
return NetworkBaseView( return NetworkBaseView(
baseViewModel: model, baseViewModel: model,
child: Card( child: Card(
@ -224,8 +236,10 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
child: Container( child: Container(
height: 250.0, height: 250.0,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.only( borderRadius:
topLeft: Radius.circular(110.0), BorderRadius.only(
topLeft: Radius.circular(
110.0),
), ),
color: Colors.white, color: Colors.white,
), ),
@ -237,11 +251,14 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
3, 3,
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment
.start,
children: [ children: [
Stack( Stack(
children: [ children: [
if (model.products[index] if (model
.products[
index]
.discountName != .discountName !=
null) null)
RotatedBox( RotatedBox(
@ -251,7 +268,8 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
BoxDecoration(), BoxDecoration(),
child: Padding( child: Padding(
padding: padding:
EdgeInsets.only( EdgeInsets
.only(
right: 5.0, right: 5.0,
top: 20.0, top: 20.0,
bottom: 5.0, bottom: 5.0,
@ -259,10 +277,13 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
child: Texts( child: Texts(
'offer' 'offer'
.toUpperCase(), .toUpperCase(),
color: Colors.red, color: Colors
fontSize: 13.0, .red,
fontSize:
13.0,
fontWeight: fontWeight:
FontWeight.w900, FontWeight
.w900,
), ),
), ),
transform: new Matrix4 transform: new Matrix4
@ -271,14 +292,21 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
), ),
), ),
Container( Container(
margin: EdgeInsets.fromLTRB( margin: EdgeInsets
0, 16, 0, 0), .fromLTRB(0, 16,
alignment: Alignment.center, 0, 0),
child: Image.network( alignment: Alignment
model.products[index] .center,
.images.isNotEmpty child:
Image.network(
model
.products[
index]
.images
.isNotEmpty
? model ? model
.products[index] .products[
index]
.images[0] .images[0]
.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',
@ -287,85 +315,112 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
), ),
), ),
Container( Container(
width: model.products[index] width: model
.products[
index]
.rxMessage != .rxMessage !=
null null
? MediaQuery.of(context) ? MediaQuery.of(
context)
.size .size
.width / .width /
5 5
: 0, : 0,
padding: EdgeInsets.all(4), padding:
decoration: BoxDecoration( EdgeInsets.all(
color: Color(0xffb23838), 4),
borderRadius: decoration:
BorderRadius.only( BoxDecoration(
color: Color(
0xffb23838),
borderRadius: BorderRadius.only(
topLeft: Radius topLeft: Radius
.circular(6)), .circular(
6)),
), ),
child: Texts( child: Texts(
model.products[index] model
.products[
index]
.rxMessage != .rxMessage !=
null null
? model ? model
.products[index] .products[
index]
.rxMessage .rxMessage
: "", : "",
color: Colors.white, color:
Colors.white,
regular: true, regular: true,
fontSize: 10, fontSize: 10,
fontWeight: fontWeight:
FontWeight.w400, FontWeight
.w400,
), ),
), ),
], ],
), ),
Container( Container(
margin: EdgeInsets.symmetric( margin: EdgeInsets
.symmetric(
horizontal: 6, horizontal: 6,
vertical: 0, vertical: 0,
), ),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment
.start,
children: [ children: [
if (model.products[index] if (model
.products[
index]
.discountName != .discountName !=
null) null)
Container( Container(
width: double.infinity, width: double
.infinity,
height: 22.0, height: 22.0,
decoration: decoration:
BoxDecoration( BoxDecoration(
color: color: Color(
Color(0xff5AB145), 0xff5AB145),
), ),
child: Center( child: Center(
child: Texts( child: Texts(
model model
.products[index] .products[
index]
.discountName, .discountName,
regular: true, regular:
color: Colors.white, true,
fontSize: 12.0, color: Colors
.white,
fontSize:
12.0,
fontWeight: fontWeight:
FontWeight.w700, FontWeight
.w700,
), ),
), ),
), ),
Texts( Texts(
model model
.products[index].name, .products[
index]
.name,
regular: true, regular: true,
fontSize: 12.58, fontSize: 12.58,
fontWeight: fontWeight:
FontWeight.w600, FontWeight
.w600,
), ),
Padding( Padding(
padding: padding:
const EdgeInsets.only( const EdgeInsets
.only(
top: 4, top: 4,
bottom: 4), bottom:
4),
child: Texts( child: Texts(
"SAR ${model.products[index].price}", "SAR ${model.products[index].price}",
bold: true, bold: true,
@ -375,26 +430,20 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
Row( Row(
children: [ children: [
StarRating( StarRating(
totalAverage: model totalAverage: model.products[index].approvedRatingSum >
.products[
index]
.approvedRatingSum >
0 0
? (model.products[index].approvedRatingSum ? (model.products[index].approvedRatingSum.toDouble() / model.products[index].approvedRatingSum.toDouble())
.toDouble() /
model
.products[index]
.approvedRatingSum
.toDouble())
.toDouble() .toDouble()
: 0, : 0,
forceStars: true), forceStars:
true),
Texts( Texts(
"(${model.products[index].approvedTotalReviews})", "(${model.products[index].approvedTotalReviews})",
regular: true, regular: true,
fontSize: 10, fontSize: 10,
fontWeight: fontWeight:
FontWeight.w400, FontWeight
.w400,
) )
], ],
), ),
@ -413,8 +462,8 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
child: Container( child: Container(
child: ListView.builder( child: ListView.builder(
itemCount: model.products.length, itemCount: model.products.length,
itemBuilder: itemBuilder: (BuildContext context,
(BuildContext context, int index) { int index) {
return Card( return Card(
// color: // color:
// model.products[index].discountName != // model.products[index].discountName !=
@ -427,7 +476,9 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
children: [ children: [
Column( Column(
children: [ children: [
if (model.products[index] if (model
.products[
index]
.discountName != .discountName !=
null) null)
Container( Container(
@ -435,21 +486,27 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
BoxDecoration(), BoxDecoration(),
child: Padding( child: Padding(
padding: padding:
EdgeInsets.only( EdgeInsets
.only(
left: 9.0, left: 9.0,
top: 8.0, top: 8.0,
right: 10.0, right: 10.0,
), ),
child: Container( child:
color: Colors.yellow, Container(
color: Colors
.yellow,
height: 25.0, height: 25.0,
width: 70.0, width: 70.0,
child: Center( child: Center(
child: Texts( child:
Texts(
'offer' 'offer'
.toUpperCase(), .toUpperCase(),
color: Colors.red, color: Colors
fontSize: 13.0, .red,
fontSize:
13.0,
fontWeight: fontWeight:
FontWeight FontWeight
.w900, .w900,
@ -457,19 +514,26 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
), ),
), ),
), ),
transform: transform: new Matrix4
new Matrix4.rotationZ( .rotationZ(
6.15099), 6.15099),
), ),
Container( Container(
margin: EdgeInsets.fromLTRB( margin: EdgeInsets
.fromLTRB(
0, 0, 0, 0), 0, 0, 0, 0),
alignment: Alignment.center, alignment: Alignment
child: Image.network( .center,
model.products[index] child:
.images.isNotEmpty Image.network(
model
.products[
index]
.images
.isNotEmpty
? model ? model
.products[index] .products[
index]
.images[0] .images[0]
.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',
@ -482,35 +546,47 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
Column( Column(
children: [ children: [
Container( Container(
width: model.products[index] width: model
.products[
index]
.rxMessage != .rxMessage !=
null null
? MediaQuery.of(context) ? MediaQuery.of(
context)
.size .size
.width / .width /
5 5
: 0, : 0,
padding: EdgeInsets.all(4), padding:
decoration: BoxDecoration( EdgeInsets.all(
color: Color(0xffb23838), 4),
borderRadius: decoration:
BorderRadius.only( BoxDecoration(
color: Color(
0xffb23838),
borderRadius: BorderRadius.only(
topLeft: Radius topLeft: Radius
.circular(6)), .circular(
6)),
), ),
child: Texts( child: Texts(
model.products[index] model
.products[
index]
.rxMessage != .rxMessage !=
null null
? model ? model
.products[index] .products[
index]
.rxMessage .rxMessage
: "", : "",
color: Colors.white, color:
Colors.white,
regular: true, regular: true,
fontSize: 10, fontSize: 10,
fontWeight: fontWeight:
FontWeight.w400, FontWeight
.w400,
), ),
), ),
], ],
@ -518,36 +594,45 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
], ],
), ),
Container( Container(
margin: EdgeInsets.symmetric( margin:
EdgeInsets.symmetric(
horizontal: 6, horizontal: 6,
vertical: 0, vertical: 0,
), ),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment
.start,
children: [ children: [
if (model.products[index] if (model
.products[index]
.discountName != .discountName !=
null) null)
Container( Container(
width: 250.0, width: 250.0,
height: 22.5, height: 22.5,
decoration: BoxDecoration( decoration:
color: Color(0xff5AB145), BoxDecoration(
color: Color(
0xff5AB145),
), ),
child: Padding( child: Padding(
padding: padding: EdgeInsets
EdgeInsets.symmetric( .symmetric(
horizontal: 5.5, horizontal: 5.5,
), ),
child: Texts( child: Texts(
model.products[index] model
.products[
index]
.discountName, .discountName,
regular: true, regular: true,
color: Colors.white, color: Colors
.white,
fontSize: 12.0, fontSize: 12.0,
fontWeight: fontWeight:
FontWeight.w700, FontWeight
.w700,
), ),
), ),
), ),
@ -555,18 +640,22 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
height: 4.0, height: 4.0,
), ),
Texts( Texts(
model.products[index].name, model.products[index]
.name,
regular: true, regular: true,
fontSize: 14.0, fontSize: 14.0,
fontWeight: FontWeight.w600, fontWeight:
FontWeight.w600,
), ),
SizedBox( SizedBox(
height: 8.0, height: 8.0,
), ),
Padding( Padding(
padding: padding:
const EdgeInsets.only( const EdgeInsets
top: 4, bottom: 4), .only(
top: 4,
bottom: 4),
child: Texts( child: Texts(
"SAR ${model.products[index].price}", "SAR ${model.products[index].price}",
bold: true, bold: true,
@ -581,25 +670,20 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
index] index]
.approvedRatingSum > .approvedRatingSum >
0 0
? (model ? (model.products[index].approvedRatingSum.toDouble() /
.products[ model.products[index].approvedRatingSum
index]
.approvedRatingSum
.toDouble() /
model
.products[
index]
.approvedRatingSum
.toDouble()) .toDouble())
.toDouble() .toDouble()
: 0, : 0,
forceStars: true), forceStars:
true),
Texts( Texts(
"(${model.products[index].approvedTotalReviews})", "(${model.products[index].approvedTotalReviews})",
regular: true, regular: true,
fontSize: 10, fontSize: 10,
fontWeight: fontWeight:
FontWeight.w500, FontWeight
.w500,
) )
], ],
), ),
@ -614,7 +698,11 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
) )
], ],
), ),
), )
)); : Center(
child: Texts(
"SORRY , there's no listed offers now :(",
color: Colors.green,
))));
} }
} }

@ -1,6 +1,7 @@
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/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/product_detail.dart';
import 'package:diplomaticquarterapp/pages/sub_categorise_page.dart'; import 'package:diplomaticquarterapp/pages/sub_categorise_page.dart';
import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
@ -8,6 +9,7 @@ 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';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
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:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:giffy_dialog/giffy_dialog.dart'; import 'package:giffy_dialog/giffy_dialog.dart';
@ -111,10 +113,10 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
context: context, context: context,
builder: (BuildContext context) { builder: (BuildContext context) {
return Container( return Container(
height: MediaQuery.of(context) // height: MediaQuery.of(context)
.size // .size
.height * // .height *
0.89, // 0.89,
color: Colors.white, color: Colors.white,
child: Center( child: Center(
child: ListView.builder( child: ListView.builder(
@ -130,7 +132,7 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
child: Padding( child: Padding(
padding: padding:
EdgeInsets.all( EdgeInsets.all(
8.0), 4.0),
child: InkWell( child: InkWell(
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
@ -229,10 +231,10 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
.size .size
.width * .width *
0.197, 0.197,
height: MediaQuery.of(context) // height: MediaQuery.of(context)
.size // .size
.height * // .height *
0.08, // 0.08,
child: Center( child: Center(
child: Texts( child: Texts(
projectViewModel.isArabic projectViewModel.isArabic
@ -646,6 +648,7 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
(BuildContext context, int index) { (BuildContext context, int index) {
return NetworkBaseView( return NetworkBaseView(
baseViewModel: model, baseViewModel: model,
child: InkWell(
child: Card( child: Card(
color: model.parentProducts[index] color: model.parentProducts[index]
.discountName != .discountName !=
@ -677,7 +680,8 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
), ),
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.only( borderRadius:
BorderRadius.only(
topLeft: topLeft:
Radius.circular(110.0), Radius.circular(110.0),
), ),
@ -716,9 +720,10 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
child: Texts( child: Texts(
'offer' 'offer'
.toUpperCase(), .toUpperCase(),
color: color: Colors
Colors.red, .red,
fontSize: 13.0, fontSize:
13.0,
fontWeight: fontWeight:
FontWeight FontWeight
.w900, .w900,
@ -730,8 +735,8 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
), ),
), ),
Container( Container(
margin: margin: EdgeInsets
EdgeInsets.fromLTRB( .fromLTRB(
0, 16, 0, 0), 0, 16, 0, 0),
alignment: alignment:
Alignment.center, Alignment.center,
@ -767,8 +772,8 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
EdgeInsets.all(4), EdgeInsets.all(4),
decoration: decoration:
BoxDecoration( BoxDecoration(
color: color: Color(
Color(0xffb23838), 0xffb23838),
borderRadius: borderRadius:
BorderRadius.only( BorderRadius.only(
topLeft: Radius topLeft: Radius
@ -812,8 +817,8 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
.discountName != .discountName !=
null) null)
Container( Container(
width: width: double
double.infinity, .infinity,
height: 13.0, height: 13.0,
decoration: decoration:
BoxDecoration( BoxDecoration(
@ -829,7 +834,8 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
regular: true, regular: true,
color: Colors color: Colors
.white, .white,
fontSize: 10.4, fontSize:
10.4,
), ),
), ),
), ),
@ -886,6 +892,16 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
], ],
), ),
), ),
),
onTap: () => {
Navigator.push(
context,
FadePage(
page: ProductDetailPage(
model.parentProducts[
index]),
)),
},
)); ));
}, },
), ),
@ -898,7 +914,8 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
itemCount: model.parentProducts.length, itemCount: model.parentProducts.length,
itemBuilder: itemBuilder:
(BuildContext context, int index) { (BuildContext context, int index) {
return Card( return InkWell(
child: Card(
child: Row( child: Row(
children: [ children: [
Stack( Stack(
@ -918,8 +935,8 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
), ),
), ),
Container( Container(
margin: margin: EdgeInsets
EdgeInsets.fromLTRB( .fromLTRB(
0, 0, 0, 0), 0, 0, 0, 0),
alignment: alignment:
Alignment.center, Alignment.center,
@ -959,14 +976,15 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
EdgeInsets.all(4), EdgeInsets.all(4),
decoration: decoration:
BoxDecoration( BoxDecoration(
color: color: Color(
Color(0xffb23838), 0xffb23838),
borderRadius: borderRadius:
BorderRadius.only( BorderRadius.only(
topLeft: Radius topLeft: Radius
.circular( .circular(
6)), 6)),
), ),
child: Expanded(
child: Texts( child: Texts(
model model
.parentProducts[ .parentProducts[
@ -978,11 +996,14 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
index] index]
.rxMessage .rxMessage
: "", : "",
color: Colors.white, color:
Colors.white,
regular: true, regular: true,
fontSize: 10, fontSize: 10,
fontWeight: fontWeight:
FontWeight.w400, FontWeight
.w400,
),
), ),
), ),
], ],
@ -990,7 +1011,6 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
], ],
), ),
Container( Container(
height: 100.0,
margin: EdgeInsets.symmetric( margin: EdgeInsets.symmetric(
horizontal: 6, horizontal: 6,
vertical: 0, vertical: 0,
@ -1000,14 +1020,22 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
MainAxisAlignment MainAxisAlignment
.spaceAround, .spaceAround,
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment
.start,
children: [ children: [
SizedBox( SizedBox(
height: 4.0, height: 4.0,
), ),
Texts( Container(
width: MediaQuery.of(
context)
.size
.width *
0.65,
child: Texts(
model model
.parentProducts[index] .parentProducts[
index]
.name, .name,
regular: true, regular: true,
fontSize: 13.2, fontSize: 13.2,
@ -1015,12 +1043,14 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
FontWeight.w500, FontWeight.w500,
maxLines: 5, maxLines: 5,
), ),
),
SizedBox( SizedBox(
height: 8.0, height: 8.0,
), ),
Padding( Padding(
padding: padding:
const EdgeInsets.only( const EdgeInsets
.only(
top: 4, top: 4,
bottom: 4), bottom: 4),
child: Texts( child: Texts(
@ -1060,6 +1090,15 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
), ),
], ],
), ),
),
onTap: () => {
Navigator.push(
context,
FadePage(
page: ProductDetailPage(model
.parentProducts[index]),
)),
},
); );
}), }),
) )

@ -80,12 +80,18 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
alignment: Alignment.centerRight, alignment: Alignment.centerRight,
child: languageID == 'ar' child: languageID == 'ar'
? Text( ? Text(
widget.product.discountDescriptionn, widget.product
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 17), .discountDescriptionn,
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 17),
) )
: Text( : Text(
widget.product.discountDescription, widget.product
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 17), .discountDescription,
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 17),
), ),
), ),
), ),
@ -96,7 +102,8 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
flex: 0, flex: 0,
child: Container( child: Container(
child: Image( child: Image(
image: AssetImage('assets/images/offer.png'), image: AssetImage(
'assets/images/offer.png'),
), ),
), ),
), ),
@ -174,7 +181,9 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
}, },
child: Text( child: Text(
TranslationBase.of(context).details, TranslationBase.of(context).details,
style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold), style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold),
), ),
color: Colors.white, color: Colors.white,
), ),
@ -202,7 +211,9 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
}, },
child: Text( child: Text(
TranslationBase.of(context).reviews, TranslationBase.of(context).reviews,
style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold), style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold),
), ),
color: Colors.white, color: Colors.white,
), ),
@ -230,7 +241,9 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
}, },
child: Text( child: Text(
TranslationBase.of(context).availability, TranslationBase.of(context).availability,
style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold), style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold),
), ),
color: Colors.white, color: Colors.white,
), ),
@ -258,7 +271,10 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
Container( Container(
child: Text( child: Text(
TranslationBase.of(context).description, TranslationBase.of(context).description,
style: TextStyle(fontSize: 17, color: Colors.grey, fontWeight: FontWeight.w600), style: TextStyle(
fontSize: 17,
color: Colors.grey,
fontWeight: FontWeight.w600),
), ),
), ),
SizedBox( SizedBox(
@ -266,8 +282,13 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
), ),
Container( Container(
child: Text( child: Text(
languageID == 'ar' ? widget.product.shortDescriptionn : widget.product.shortDescription ?? "", languageID == 'ar'
style: TextStyle(fontSize: 16, fontFamily: 'WorkSans-Regular'), ? widget.product.shortDescriptionn
: widget.product.shortDescription ??
"",
style: TextStyle(
fontSize: 16,
fontFamily: 'WorkSans-Regular'),
), ),
), ),
SizedBox( SizedBox(
@ -276,7 +297,10 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
Container( Container(
child: Text( child: Text(
TranslationBase.of(context).howToUse, TranslationBase.of(context).howToUse,
style: TextStyle(fontSize: 17, color: Colors.grey, fontWeight: FontWeight.w600), style: TextStyle(
fontSize: 17,
color: Colors.grey,
fontWeight: FontWeight.w600),
), ),
), ),
SizedBox( SizedBox(
@ -284,8 +308,12 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
), ),
Container( Container(
child: Text( child: Text(
languageID == 'ar' ? widget.product.fullDescriptionn : widget.product.fullDescription, languageID == 'ar'
style: TextStyle(fontSize: 16, fontFamily: 'WorkSans-Regular'), ? widget.product.fullDescriptionn
: widget.product.fullDescription,
style: TextStyle(
fontSize: 16,
fontFamily: 'WorkSans-Regular'),
), ),
), ),
], ],
@ -293,41 +321,83 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
) )
: isReviews : isReviews
? BaseView<ProductDetailViewModel>( ? BaseView<ProductDetailViewModel>(
onModelReady: (model) => model.getProductReviewsData(widget.product.id), onModelReady: (model) =>
builder: (_, model, wi) => model.getProductReviewsData(
model.productDetailService.length != 0 && model.productDetailService[0].reviews.length != 0 widget.product.id),
builder: (_, model, wi) => model
.productDetailService
.length !=
0 &&
model.productDetailService[0]
.reviews.length !=
0
? ListView.builder( ? ListView.builder(
physics: ScrollPhysics(), physics: ScrollPhysics(),
itemCount: model.productDetailService[0].reviews.length, itemCount: model
.productDetailService[0]
.reviews
.length,
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
shrinkWrap: true, shrinkWrap: true,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context,
int index) {
return Padding( return Padding(
padding: EdgeInsets.all(8.0), padding: EdgeInsets.all(8.0),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment:
crossAxisAlignment: CrossAxisAlignment.start, MainAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Container( Container(
child: Row( child: Row(
children: [ children: [
Container( Container(
child: Text( child: Text(
model.productDetailService[0].reviews[index].customerId.toString(), model
style: TextStyle(fontSize: 17, color: Colors.grey, fontWeight: FontWeight.w600), .productDetailService[
0]
.reviews[
index]
.customerId
.toString(),
style: TextStyle(
fontSize: 17,
color: Colors
.grey,
fontWeight:
FontWeight
.w600),
), ),
), ),
Container( Container(
margin: EdgeInsets.only(left: 210), margin:
child: RatingBar.readOnly( EdgeInsets.only(
initialRating: model.productDetailService[0].reviews[index].rating.toDouble(), left: 210),
child: RatingBar
.readOnly(
initialRating: model
.productDetailService[
0]
.reviews[
index]
.rating
.toDouble(),
size: 15.0, size: 15.0,
filledColor: Colors.yellow[700], filledColor:
emptyColor: Colors.grey[500], Colors.yellow[
isHalfAllowed: true, 700],
halfFilledIcon: Icons.star_half, emptyColor: Colors
filledIcon: Icons.star, .grey[500],
emptyIcon: Icons.star, isHalfAllowed:
true,
halfFilledIcon:
Icons
.star_half,
filledIcon:
Icons.star,
emptyIcon:
Icons.star,
), ),
), ),
], ],
@ -338,14 +408,21 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
), ),
Container( Container(
child: Text( child: Text(
model.productDetailService[0].reviews[index].reviewText, model
style: TextStyle(fontSize: 20), .productDetailService[
0]
.reviews[index]
.reviewText,
style: TextStyle(
fontSize: 20),
), ),
), ),
SizedBox( SizedBox(
height: 50, height: 50,
), ),
Divider(height: 1, color: Colors.grey), Divider(
height: 1,
color: Colors.grey),
], ],
), ),
); );
@ -359,32 +436,47 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
) )
: isAvailabilty : isAvailabilty
? BaseView<ProductDetailViewModel>( ? BaseView<ProductDetailViewModel>(
onModelReady: (model) => model.getProductLocationData(), onModelReady: (model) =>
builder: (_, model, wi) => model.productLocationService.length == 0 model.getProductLocationData(),
builder: (_, model, wi) => model
.productLocationService
.length ==
0
? Container( ? Container(
padding: EdgeInsets.all(15), padding: EdgeInsets.all(15),
alignment: Alignment.center, alignment: Alignment.center,
child: Text('No location Available'), child: Text(
'No location Available'),
) )
: ListView.builder( : ListView.builder(
physics: ScrollPhysics(), physics: ScrollPhysics(),
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
shrinkWrap: true, shrinkWrap: true,
itemCount: model.productLocationService.length, itemCount: model
itemBuilder: (BuildContext context, int index) { .productLocationService
.length,
itemBuilder:
(BuildContext context,
int index) {
return Padding( return Padding(
padding: EdgeInsets.all(8.0), padding:
EdgeInsets.all(8.0),
child: Column( child: Column(
// crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
// mainAxisAlignment: MainAxisAlignment.start, // mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
Row( Row(
// crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment:
MainAxisAlignment
.start,
children: [ children: [
Expanded( Expanded(
flex: 1, flex: 1,
child: Image.network(model.productLocationService[index].projectImageUrl), child: Image.network(model
.productLocationService[
index]
.projectImageUrl),
), ),
SizedBox( SizedBox(
width: 10, width: 10,
@ -392,31 +484,48 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
Expanded( Expanded(
flex: 4, flex: 4,
child: Text( child: Text(
model.productLocationService[index].locationDescription + model
.productLocationService[
index]
.locationDescription +
"\n" + "\n" +
fixingString(model.productLocationService[0].cityName.toString()), fixingString(model
style: TextStyle(fontSize: 12), .productLocationService[
0]
.cityName
.toString()),
style: TextStyle(
fontSize:
12),
), ),
), ),
Expanded( Expanded(
flex: 1, flex: 1,
child: IconButton( child: IconButton(
icon: Icon(Icons.location_on), icon: Icon(Icons
color: Colors.red, .location_on),
onPressed: () {}, color:
Colors.red,
onPressed:
() {},
), ),
), ),
Expanded( Expanded(
flex: 1, flex: 1,
child: IconButton( child: IconButton(
icon: Icon(Icons.phone), icon: Icon(Icons
color: Colors.red, .phone),
onPressed: () {}, color:
Colors.red,
onPressed:
() {},
), ),
), ),
], ],
), ),
Divider(height: 1.2, color: Colors.grey) Divider(
height: 1.2,
color: Colors.grey)
], ],
), ),
); );
@ -431,8 +540,12 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
], ],
), ),
), ),
bottomSheet: footerWidget(widget.product.stockAvailability != 'Out of stock', widget.product.orderMaximumQuantity, bottomSheet: footerWidget(
widget.product.orderMinimumQuantity, widget.product.stockQuantity, widget.product), widget.product.stockAvailability != 'Out of stock',
widget.product.orderMaximumQuantity,
widget.product.orderMinimumQuantity,
widget.product.stockQuantity,
widget.product),
) )
: AppScaffold( : AppScaffold(
appBarTitle: 'product detail page', appBarTitle: 'product detail page',
@ -465,12 +578,18 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
alignment: Alignment.centerRight, alignment: Alignment.centerRight,
child: languageID == 'ar' child: languageID == 'ar'
? Text( ? Text(
widget.product.discountDescriptionn, widget.product
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 17), .discountDescriptionn,
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 17),
) )
: Text( : Text(
widget.product.discountDescription, widget.product
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 17), .discountDescription,
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 17),
), ),
), ),
), ),
@ -481,7 +600,8 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
flex: 0, flex: 0,
child: Container( child: Container(
child: Image( child: Image(
image: AssetImage('assets/images/offer.png'), image: AssetImage(
'assets/images/offer.png'),
), ),
), ),
), ),
@ -551,7 +671,9 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
}, },
child: Text( child: Text(
TranslationBase.of(context).details, TranslationBase.of(context).details,
style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold), style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold),
), ),
color: Colors.white, color: Colors.white,
), ),
@ -579,7 +701,9 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
}, },
child: Text( child: Text(
TranslationBase.of(context).reviews, TranslationBase.of(context).reviews,
style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold), style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold),
), ),
color: Colors.white, color: Colors.white,
), ),
@ -607,7 +731,9 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
}, },
child: Text( child: Text(
TranslationBase.of(context).availability, TranslationBase.of(context).availability,
style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold), style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold),
), ),
color: Colors.white, color: Colors.white,
), ),
@ -635,7 +761,10 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
Container( Container(
child: Text( child: Text(
TranslationBase.of(context).description, TranslationBase.of(context).description,
style: TextStyle(fontSize: 17, color: Colors.grey, fontWeight: FontWeight.w600), style: TextStyle(
fontSize: 17,
color: Colors.grey,
fontWeight: FontWeight.w600),
), ),
), ),
SizedBox( SizedBox(
@ -643,8 +772,12 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
), ),
Container( Container(
child: Text( child: Text(
languageID == 'ar' ? widget.product.fullDescriptionn : widget.product.fullDescription, languageID == 'ar'
style: TextStyle(fontSize: 16, fontFamily: 'WorkSans-Regular'), ? widget.product.fullDescriptionn
: widget.product.fullDescription,
style: TextStyle(
fontSize: 16,
fontFamily: 'WorkSans-Regular'),
), ),
), ),
], ],
@ -652,41 +785,83 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
) )
: isReviews : isReviews
? BaseView<ProductDetailViewModel>( ? BaseView<ProductDetailViewModel>(
onModelReady: (model) => model.getProductReviewsData(widget.product.id), onModelReady: (model) =>
builder: (_, model, wi) => model.getProductReviewsData(
model.productDetailService.length != 0 && model.productDetailService[0].reviews.length != 0 widget.product.id),
builder: (_, model, wi) => model
.productDetailService
.length !=
0 &&
model.productDetailService[0]
.reviews.length !=
0
? ListView.builder( ? ListView.builder(
physics: ScrollPhysics(), physics: ScrollPhysics(),
itemCount: model.productDetailService[0].reviews.length, itemCount: model
.productDetailService[0]
.reviews
.length,
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
shrinkWrap: true, shrinkWrap: true,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context,
int index) {
return Padding( return Padding(
padding: EdgeInsets.all(8.0), padding: EdgeInsets.all(8.0),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment:
crossAxisAlignment: CrossAxisAlignment.start, MainAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Container( Container(
child: Row( child: Row(
children: [ children: [
Container( Container(
child: Text( child: Text(
model.productDetailService[0].reviews[index].customerId.toString(), model
style: TextStyle(fontSize: 17, color: Colors.grey, fontWeight: FontWeight.w600), .productDetailService[
0]
.reviews[
index]
.customerId
.toString(),
style: TextStyle(
fontSize: 17,
color: Colors
.grey,
fontWeight:
FontWeight
.w600),
), ),
), ),
Container( Container(
margin: EdgeInsets.only(left: 210), margin:
child: RatingBar.readOnly( EdgeInsets.only(
initialRating: model.productDetailService[0].reviews[index].rating.toDouble(), left: 210),
child: RatingBar
.readOnly(
initialRating: model
.productDetailService[
0]
.reviews[
index]
.rating
.toDouble(),
size: 15.0, size: 15.0,
filledColor: Colors.yellow[700], filledColor:
emptyColor: Colors.grey[500], Colors.yellow[
isHalfAllowed: true, 700],
halfFilledIcon: Icons.star_half, emptyColor: Colors
filledIcon: Icons.star, .grey[500],
emptyIcon: Icons.star, isHalfAllowed:
true,
halfFilledIcon:
Icons
.star_half,
filledIcon:
Icons.star,
emptyIcon:
Icons.star,
), ),
), ),
], ],
@ -697,14 +872,21 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
), ),
Container( Container(
child: Text( child: Text(
model.productDetailService[0].reviews[index].reviewText, model
style: TextStyle(fontSize: 20), .productDetailService[
0]
.reviews[index]
.reviewText,
style: TextStyle(
fontSize: 20),
), ),
), ),
SizedBox( SizedBox(
height: 50, height: 50,
), ),
Divider(height: 1, color: Colors.grey), Divider(
height: 1,
color: Colors.grey),
], ],
), ),
); );
@ -718,13 +900,17 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
) )
: isAvailabilty : isAvailabilty
? BaseView<ProductDetailViewModel>( ? BaseView<ProductDetailViewModel>(
onModelReady: (model) => model.getProductLocationData(), onModelReady: (model) =>
builder: (_, model, wi) => ListView.builder( model.getProductLocationData(),
builder: (_, model, wi) =>
ListView.builder(
physics: ScrollPhysics(), physics: ScrollPhysics(),
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
shrinkWrap: true, shrinkWrap: true,
itemCount: model.productLocationService.length, itemCount: model
itemBuilder: (BuildContext context, int index) { .productLocationService.length,
itemBuilder: (BuildContext context,
int index) {
return Padding( return Padding(
padding: EdgeInsets.all(8.0), padding: EdgeInsets.all(8.0),
child: Column( child: Column(
@ -733,11 +919,15 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
children: [ children: [
Row( Row(
// crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment:
MainAxisAlignment.start,
children: [ children: [
Expanded( Expanded(
flex: 1, flex: 1,
child: Image.network(model.productLocationService[index].projectImageUrl), child: Image.network(model
.productLocationService[
index]
.projectImageUrl),
), ),
SizedBox( SizedBox(
width: 10, width: 10,
@ -745,16 +935,25 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
Expanded( Expanded(
flex: 4, flex: 4,
child: Text( child: Text(
model.productLocationService[index].locationDescription + model
.productLocationService[
index]
.locationDescription +
"\n" + "\n" +
fixingString(model.productLocationService[0].cityName.toString()), fixingString(model
style: TextStyle(fontSize: 12), .productLocationService[
0]
.cityName
.toString()),
style: TextStyle(
fontSize: 12),
), ),
), ),
Expanded( Expanded(
flex: 1, flex: 1,
child: IconButton( child: IconButton(
icon: Icon(Icons.location_on), icon: Icon(Icons
.location_on),
color: Colors.red, color: Colors.red,
onPressed: () {}, onPressed: () {},
), ),
@ -762,14 +961,17 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
Expanded( Expanded(
flex: 1, flex: 1,
child: IconButton( child: IconButton(
icon: Icon(Icons.phone), icon:
Icon(Icons.phone),
color: Colors.red, color: Colors.red,
onPressed: () {}, onPressed: () {},
), ),
), ),
], ],
), ),
Divider(height: 1.2, color: Colors.grey) Divider(
height: 1.2,
color: Colors.grey)
], ],
), ),
); );
@ -784,8 +986,12 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
], ],
), ),
), ),
bottomSheet: footerWidget(widget.product.stockAvailability != 'Out of stock', widget.product.orderMaximumQuantity, bottomSheet: footerWidget(
widget.product.orderMinimumQuantity, widget.product.stockQuantity, widget.product), widget.product.stockAvailability != 'Out of stock',
widget.product.orderMaximumQuantity,
widget.product.orderMinimumQuantity,
widget.product.stockQuantity,
widget.product),
); );
} }
} }
@ -796,7 +1002,8 @@ class footerWidget extends StatefulWidget {
final int minQuantity; final int minQuantity;
final int quantityLimit; final int quantityLimit;
final PharmacyProduct item; final PharmacyProduct item;
footerWidget(this.isAvailble, this.maxQuantity, this.minQuantity, this.quantityLimit, this.item); footerWidget(this.isAvailble, this.maxQuantity, this.minQuantity,
this.quantityLimit, this.item);
@override @override
_footerWidgetState createState() => _footerWidgetState(); _footerWidgetState createState() => _footerWidgetState();
} }
@ -826,7 +1033,8 @@ class _footerWidgetState extends State<footerWidget> {
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Text( child: Text(
TranslationBase.of(context).quantity, TranslationBase.of(context).quantity,
style: TextStyle(fontSize: 15, fontWeight: FontWeight.bold), style: TextStyle(
fontSize: 15, fontWeight: FontWeight.bold),
), ),
), ),
// ListView( // ListView(
@ -848,7 +1056,9 @@ class _footerWidgetState extends State<footerWidget> {
color: Colors.white, color: Colors.white,
child: Text( child: Text(
'1', '1',
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20), style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 20),
), ),
), ),
onTap: () { onTap: () {
@ -873,7 +1083,9 @@ class _footerWidgetState extends State<footerWidget> {
color: Colors.white, color: Colors.white,
child: Text( child: Text(
'2', '2',
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20), style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 20),
), ),
), ),
onTap: () { onTap: () {
@ -898,7 +1110,9 @@ class _footerWidgetState extends State<footerWidget> {
color: Colors.white, color: Colors.white,
child: Text( child: Text(
'3', '3',
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20), style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 20),
), ),
), ),
onTap: () { onTap: () {
@ -923,7 +1137,9 @@ class _footerWidgetState extends State<footerWidget> {
color: Colors.white, color: Colors.white,
child: Text( child: Text(
'4', '4',
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20), style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 20),
), ),
), ),
onTap: () { onTap: () {
@ -948,7 +1164,9 @@ class _footerWidgetState extends State<footerWidget> {
color: Colors.white, color: Colors.white,
child: Text( child: Text(
'5', '5',
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20), style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 20),
), ),
), ),
onTap: () { onTap: () {
@ -973,7 +1191,9 @@ class _footerWidgetState extends State<footerWidget> {
color: Colors.white, color: Colors.white,
child: Text( child: Text(
'6', '6',
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20), style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 20),
), ),
), ),
onTap: () { onTap: () {
@ -998,7 +1218,9 @@ class _footerWidgetState extends State<footerWidget> {
color: Colors.white, color: Colors.white,
child: Text( child: Text(
'7', '7',
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20), style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 20),
), ),
), ),
onTap: () { onTap: () {
@ -1023,7 +1245,9 @@ class _footerWidgetState extends State<footerWidget> {
color: Colors.white, color: Colors.white,
child: Text( child: Text(
'8', '8',
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20), style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 20),
), ),
), ),
onTap: () { onTap: () {
@ -1048,7 +1272,9 @@ class _footerWidgetState extends State<footerWidget> {
color: Colors.white, color: Colors.white,
child: Text( child: Text(
'9', '9',
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20), style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 20),
), ),
), ),
onTap: () { onTap: () {
@ -1073,7 +1299,9 @@ class _footerWidgetState extends State<footerWidget> {
color: Colors.white, color: Colors.white,
child: Text( child: Text(
'10', '10',
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 20), style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 20),
), ),
), ),
onTap: () { onTap: () {
@ -1094,7 +1322,8 @@ class _footerWidgetState extends State<footerWidget> {
Container( Container(
width: 50.0, width: 50.0,
child: TextField( child: TextField(
decoration: InputDecoration(labelText: 'quantity #'), decoration:
InputDecoration(labelText: 'quantity #'),
onChanged: (text) { onChanged: (text) {
print(price); print(price);
print(widget.quantityLimit); print(widget.quantityLimit);
@ -1173,7 +1402,10 @@ class _footerWidgetState extends State<footerWidget> {
alignment: Alignment.center, alignment: Alignment.center,
child: Text( child: Text(
TranslationBase.of(context).addToCart, TranslationBase.of(context).addToCart,
style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 15), style: TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
fontSize: 15),
), ),
), ),
) )
@ -1188,7 +1420,10 @@ class _footerWidgetState extends State<footerWidget> {
color: Colors.green, color: Colors.green,
child: Text( child: Text(
TranslationBase.of(context).addToCart, TranslationBase.of(context).addToCart,
style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 15), style: TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
fontSize: 15),
), ),
), ),
), ),
@ -1204,7 +1439,10 @@ class _footerWidgetState extends State<footerWidget> {
alignment: Alignment.center, alignment: Alignment.center,
child: Text( child: Text(
TranslationBase.of(context).buyNow, TranslationBase.of(context).buyNow,
style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 15), style: TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
fontSize: 15),
), ),
), ),
) )
@ -1214,7 +1452,8 @@ class _footerWidgetState extends State<footerWidget> {
addToCartFunction(price, widget.item.id); addToCartFunction(price, widget.item.id);
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => CartOrderPage()), MaterialPageRoute(
builder: (context) => CartOrderPage()),
); );
}, },
child: Container( child: Container(
@ -1224,7 +1463,10 @@ class _footerWidgetState extends State<footerWidget> {
color: Colors.blue, color: Colors.blue,
child: Text( child: Text(
TranslationBase.of(context).buyNow, TranslationBase.of(context).buyNow,
style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 15), style: TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
fontSize: 15),
), ),
), ),
), ),
@ -1265,12 +1507,15 @@ class _productNameAndPriceState extends State<productNameAndPrice> {
widget.item.stockAvailability, widget.item.stockAvailability,
style: widget.item.stockAvailability == 'Out of stock' style: widget.item.stockAvailability == 'Out of stock'
? TextStyle(fontWeight: FontWeight.bold, color: Colors.red) ? TextStyle(fontWeight: FontWeight.bold, color: Colors.red)
: TextStyle(fontWeight: FontWeight.bold, color: Colors.green), : TextStyle(
fontWeight: FontWeight.bold, color: Colors.green),
), ),
SizedBox(width: 20), SizedBox(width: 20),
widget.item.stockAvailability == 'Out of stock' && customerId != null widget.item.stockAvailability == 'Out of stock' &&
customerId != null
? InkWell( ? InkWell(
onTap: () => notifyMeWhenAvailable(context, widget.item.id), onTap: () =>
notifyMeWhenAvailable(context, widget.item.id),
child: Row(children: [ child: Row(children: [
Text( Text(
TranslationBase.of(context).notifyMe, TranslationBase.of(context).notifyMe,
@ -1288,7 +1533,9 @@ class _productNameAndPriceState extends State<productNameAndPrice> {
]), ]),
) )
: Container( : Container(
margin: languageID == 'ar' ? EdgeInsets.only(right: 25) : EdgeInsets.only(left: 25), margin: languageID == 'ar'
? EdgeInsets.only(right: 25)
: EdgeInsets.only(left: 25),
width: 40, width: 40,
height: 40, height: 40,
decoration: BoxDecoration( decoration: BoxDecoration(
@ -1324,9 +1571,12 @@ class _productNameAndPriceState extends State<productNameAndPrice> {
child: Container( child: Container(
margin: EdgeInsets.only(left: 5), margin: EdgeInsets.only(left: 5),
child: Align( child: Align(
alignment: languageID == 'ar' ? Alignment.topRight : Alignment.topLeft, alignment:
languageID == 'ar' ? Alignment.topRight : Alignment.topLeft,
child: Text( child: Text(
languageID == 'ar' ? widget.item.fullDescriptionn : widget.item.fullDescription, languageID == 'ar'
? widget.item.fullDescriptionn
: widget.item.fullDescription,
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15), style: TextStyle(fontWeight: FontWeight.bold, fontSize: 15),
), ),
), ),
@ -1358,7 +1608,9 @@ class _productNameAndPriceState extends State<productNameAndPrice> {
child: Container( child: Container(
child: widget.item.rxMessage != null child: widget.item.rxMessage != null
? Text( ? Text(
languageID == 'ar' ? widget.item.rxMessagen.toString() : widget.item.rxMessage.toString(), languageID == 'ar'
? widget.item.rxMessagen.toString()
: widget.item.rxMessage.toString(),
style: TextStyle(color: Colors.red, fontSize: 10), style: TextStyle(color: Colors.red, fontSize: 10),
) )
: Container()), : Container()),
@ -1524,7 +1776,9 @@ slideDetail() {
), ),
color: Colors.white, color: Colors.white,
), ),
child: const Text('1', textAlign: TextAlign.center, style: TextStyle(color: Color(0xFF000000))), child: const Text('1',
textAlign: TextAlign.center,
style: TextStyle(color: Color(0xFF000000))),
), ),
) )
], ],
@ -1606,7 +1860,13 @@ settingModalBottomSheet(context) {
leading: new Icon(Icons.shopping_cart), leading: new Icon(Icons.shopping_cart),
title: new Text('Add to cart'), title: new Text('Add to cart'),
onTap: () => { onTap: () => {
if (price > 0) {addToCartFunction(price, itemID)} else {AppToast.showErrorToast(message: "you should add quantity")} if (price > 0)
{addToCartFunction(price, itemID)}
else
{
AppToast.showErrorToast(
message: "you should add quantity")
}
}), }),
new ListTile( new ListTile(
leading: new Icon(Icons.favorite_border), leading: new Icon(Icons.favorite_border),
@ -1617,7 +1877,8 @@ settingModalBottomSheet(context) {
leading: new Icon(Icons.compare), leading: new Icon(Icons.compare),
title: new Text('Compare'), title: new Text('Compare'),
onTap: () => { onTap: () => {
Provider.of<CompareList>(context, listen: false).addItem(specificationData), Provider.of<CompareList>(context, listen: false)
.addItem(specificationData),
}, },
), ),
], ],

@ -27,7 +27,7 @@ class CartOrderPage extends StatelessWidget {
value: model.cartResponse, value: model.cartResponse,
child: AppScaffold( child: AppScaffold(
appBarTitle: TranslationBase.of(context).shoppingCart, appBarTitle: TranslationBase.of(context).shoppingCart,
isShowAppBar: false, isShowAppBar: true,
isPharmacy: true, isPharmacy: true,
baseViewModel: model, baseViewModel: model,
backgroundColor: Colors.white, backgroundColor: Colors.white,

@ -9,6 +9,7 @@ import 'package:diplomaticquarterapp/pages/pharmacies/screens/payment-method-sel
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/widgets/ProductOrderPreviewItem.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/widgets/ProductOrderPreviewItem.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart'; import 'package:diplomaticquarterapp/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.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/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
@ -25,9 +26,7 @@ class OrderPreviewPage extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final mediaQuery = MediaQuery.of(context); final mediaQuery = MediaQuery.of(context);
final height = mediaQuery.size.height - final height = mediaQuery.size.height - 60 - mediaQuery.padding.top;
60 -
mediaQuery.padding.top;
return BaseView<OrderPreviewViewModel>( return BaseView<OrderPreviewViewModel>(
onModelReady: (model) => model.getShoppingCart(), onModelReady: (model) => model.getShoppingCart(),
@ -781,22 +780,15 @@ class PaymentBottomWidget extends StatelessWidget {
), ),
onPressed: (paymentData.address != null && onPressed: (paymentData.address != null &&
paymentData.paymentOption != null) paymentData.paymentOption != null)
? () => { ? () async {
model.makeOrder().then((_) { await model.makeOrder();
if (model.state != ViewState.Idle) { if (model.state != ViewState.Idle) {
SnackBar snackBar = SnackBar( AppToast.showSuccessToast(message: "Order has been placed successfully!!");
content: Text( } else {
'Order has been placed successfully!!')); AppToast.showErrorToast(message: model.error);
scaffold.showSnackBar(snackBar);
} }
Navigator.pop(context);
// Navigator.pushAndRemoveUntil( Navigator.pop(context);
// context,
// MaterialPageRoute(
// builder: (context) =>
// PharmacyPage()),
// (Route<dynamic> r) => false);
})
} }
: null, : null,
child: Padding( child: Padding(

@ -20,6 +20,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:rating_bar/rating_bar.dart'; import 'package:rating_bar/rating_bar.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/product-brands.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/product-brands.dart';
import '../../final_products_page.dart';
import 'lacum-activitaion-vida-page.dart'; import 'lacum-activitaion-vida-page.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/doctor_card.dart'; import 'package:diplomaticquarterapp/widgets/data_display/medical/doctor_card.dart';
import 'package:diplomaticquarterapp/core/viewModels/medical/prescriptions_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/medical/prescriptions_view_model.dart';
@ -49,7 +50,7 @@ class PharmacyPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
BannerPager(model), BannerPager(model),
// GridViewButtons(model), GridViewButtons(model),
Container( Container(
margin: EdgeInsets.fromLTRB(10, 10, 10, 10), margin: EdgeInsets.fromLTRB(10, 10, 10, 10),
child: Row( child: Row(
@ -77,16 +78,17 @@ class PharmacyPage extends StatelessWidget {
], ],
), ),
), ),
Container( Container(
padding: EdgeInsets.symmetric(horizontal: 16.0, vertical: 24.0), padding:
EdgeInsets.symmetric(horizontal: 16.0, vertical: 24.0),
height: MediaQuery.of(context).size.height * 0.30, height: MediaQuery.of(context).size.height * 0.30,
// width: 200.0, // width: 200.0,
// height: MediaQuery.of(context).size.height / 4 + 20, // height: MediaQuery.of(context).size.height / 4 + 20,
margin: EdgeInsets.only(left: 10), margin: EdgeInsets.only(left: 10),
child: BaseView<PharmacyModuleViewModel>( child: BaseView<PharmacyModuleViewModel>(
onModelReady: (model) => model.getPrescription(), onModelReady: (model) => model.getPrescription(),
builder: (_, model, wi) => model.prescriptionsList.length != 0 builder: (_, model, wi) => model.prescriptionsList.length !=
0
// model.getPrescription(); // model.getPrescription();
? ListView.builder( ? ListView.builder(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
@ -98,8 +100,10 @@ class PharmacyPage extends StatelessWidget {
itemBuilder: (context, index) { itemBuilder: (context, index) {
return Container( return Container(
// width: 160.0, // width: 160.0,
height: MediaQuery.of(context).size.height * 0.6, height:
padding: EdgeInsets.only(bottom: 5.0, left: 5.0), MediaQuery.of(context).size.height * 0.6,
padding:
EdgeInsets.only(bottom: 5.0, left: 5.0),
margin: EdgeInsets.only(right: 10.0), margin: EdgeInsets.only(right: 10.0),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
@ -110,7 +114,8 @@ class PharmacyPage extends StatelessWidget {
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(10.0)), borderRadius: BorderRadius.circular(10.0)),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row( Row(
children: <Widget>[ children: <Widget>[
@ -134,13 +139,15 @@ class PharmacyPage extends StatelessWidget {
// crossAxisAlignment: CrossAxisAlignment.center, // crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Container( Container(
margin: EdgeInsets.only(left: 1), margin:
EdgeInsets.only(left: 1),
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 15.0, right: 15.0), left: 15.0, right: 15.0),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
color: Colors.green, color: Colors.green,
style: BorderStyle.solid, style:
BorderStyle.solid,
width: 4.0, width: 4.0,
), ),
color: Colors.green, color: Colors.green,
@ -148,7 +155,9 @@ class PharmacyPage extends StatelessWidget {
BorderRadius.circular( BorderRadius.circular(
30.0)), 30.0)),
child: Text( child: Text(
model.prescriptionsList[index] model
.prescriptionsList[
index]
.isInOutPatientDescription .isInOutPatientDescription
.toString(), .toString(),
style: TextStyle( style: TextStyle(
@ -179,7 +188,8 @@ class PharmacyPage extends StatelessWidget {
], ],
), ),
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Container( Container(
margin: EdgeInsets.only(left: 5), margin: EdgeInsets.only(left: 5),
@ -209,7 +219,8 @@ class PharmacyPage extends StatelessWidget {
], ],
), ),
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Container( Container(
margin: EdgeInsets.only(left: 5), margin: EdgeInsets.only(left: 5),
@ -237,10 +248,12 @@ class PharmacyPage extends StatelessWidget {
child: RatingBar.readOnly( child: RatingBar.readOnly(
// initialRating: productRate, // initialRating: productRate,
size: 15.0, size: 15.0,
filledColor: Colors.yellow[700], filledColor:
Colors.yellow[700],
emptyColor: Colors.grey[500], emptyColor: Colors.grey[500],
isHalfAllowed: true, isHalfAllowed: true,
halfFilledIcon: Icons.star_half, halfFilledIcon:
Icons.star_half,
filledIcon: Icons.star, filledIcon: Icons.star,
emptyIcon: Icons.star, emptyIcon: Icons.star,
), ),
@ -333,7 +346,17 @@ class PharmacyPage extends StatelessWidget {
hPadding: 4, hPadding: 4,
borderColor: Colors.green, borderColor: Colors.green,
textColor: Colors.green, textColor: Colors.green,
handler: () {}, handler: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => FinalProductsPage(
id: "",
productType: 3,
),
),
);
},
), ),
], ],
), ),
@ -367,7 +390,14 @@ class PharmacyPage extends StatelessWidget {
hPadding: 4, hPadding: 4,
handler: () => { handler: () => {
Navigator.push( Navigator.push(
context, FadePage(page: ProductBrandsPage())), context,
MaterialPageRoute(
builder: (context) => FinalProductsPage(
id: "",
productType: 4,
),
),
),
}, },
), ),
], ],

@ -1,28 +1,24 @@
import 'package:diplomaticquarterapp/core/model/pharmacies/order_detail.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/orders_model.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/orders_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/order_model_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/order_model_view_model.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/order/Order.dart'; import 'package:diplomaticquarterapp/pages/pharmacy/order/Order.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/order/TrackDriver.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart'; import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart';
import 'package:diplomaticquarterapp/widgets/in_app_browser/InAppBrowser.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:diplomaticquarterapp/widgets//pharmacy/product_tile.dart'; import 'package:diplomaticquarterapp/widgets//pharmacy/product_tile.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/order_model.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:flutter/src/widgets/image.dart' as flutterImage; import 'package:flutter/src/widgets/image.dart' as flutterImage;
import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:provider/provider.dart';
dynamic languageID; dynamic languageID;
class OrderDetailsPage extends StatefulWidget { class OrderDetailsPage extends StatefulWidget {
Orders orderModel; Orders orderModel;
OrderDetailsPage({@required this.orderModel}); OrderDetailsPage({@required this.orderModel});
// Orders orderModel; // Orders orderModel;
@ -40,9 +36,9 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
// AppSharedPreferences sharedPref = AppSharedPreferences(); // AppSharedPreferences sharedPref = AppSharedPreferences();
String customerId; String customerId;
List<OrderModel> ordersList = []; List<OrderDetailModel> ordersList = [];
List<OrderModel> cancelledOrderList = []; List<OrderDetailModel> cancelledOrderList = [];
// String orderId="3516"; // String orderId="3516";
var model; var model;
@ -52,6 +48,8 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
var dataIsCancel; var dataIsCancel;
var dataIsRefund; var dataIsRefund;
MyInAppBrowser browser;
@override @override
void initState() { void initState() {
getLanguageID(); getLanguageID();
@ -71,7 +69,9 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
appBarTitle: TranslationBase.of(context).orderDetail, appBarTitle: TranslationBase.of(context).orderDetail,
isShowAppBar: true, isShowAppBar: true,
isPharmacy: true, isPharmacy: true,
body: Container( baseViewModel: model,
body: model.orderListModel.length > 0
? Container(
color: Colors.white, color: Colors.white,
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
@ -111,10 +111,8 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
borderRadius: BorderRadius.circular(30.0)), borderRadius: BorderRadius.circular(30.0)),
child: Text( child: Text(
languageID == "ar" languageID == "ar"
? model.orderListModel[0].orderStatusn.toString() ? model.orderListModel[0].orderStatusn
: model.orderListModel[0].orderStatus : model.orderListModel[0].orderStatus,
.toString()
.substring(12),
// TranslationBase.of(context).delivered, // TranslationBase.of(context).delivered,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
@ -131,13 +129,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Text(
model.orderListModel[0].shippingAddress.firstName "${model.orderListModel[0].shippingAddress.firstName} ${model.orderListModel[0].shippingAddress.lastName}",
.toString()
.substring(10) +
' ' +
model.orderListModel[0].shippingAddress.lastName
.toString()
.substring(9),
style: TextStyle( style: TextStyle(
fontSize: 15.0, fontSize: 15.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
@ -172,7 +164,8 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
.toString() .toString()
.substring(9) + .substring(9) +
' ' + ' ' +
model.orderListModel[0].shippingAddress.country model.orderListModel[0].shippingAddress
.country
.toString() + .toString() +
' ' + ' ' +
model.orderListModel[0].shippingAddress model.orderListModel[0].shippingAddress
@ -199,7 +192,8 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
Container( Container(
margin: EdgeInsets.only(top: 5.0, bottom: 5.0), margin: EdgeInsets.only(top: 5.0, bottom: 5.0),
child: Text( child: Text(
model.orderListModel[0].shippingAddress.phoneNumber model.orderListModel[0].shippingAddress
.phoneNumber
.toString(), .toString(),
style: TextStyle( style: TextStyle(
fontSize: 15.0, fontSize: 15.0,
@ -333,36 +327,43 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
itemBuilder: (context, index) { itemBuilder: (context, index) {
return Container( return Container(
child: productTile( child: productTile(
productName: model productName: model.orderListModel[0]
.orderListModel[0].orderItems[index].product.name .orderItems[index].product.name
.toString(), .toString(),
productPrice: model productPrice: model.orderListModel[0]
.orderListModel[0].orderItems[index].product.price .orderItems[index].product.price
.toString(), .toString(),
productRate: model.orderListModel[0].orderItems[index] productRate: model.orderListModel[0]
.product.approvedRatingSum .orderItems[index].product.approvedRatingSum
.toDouble(), .toDouble(),
productReviews: model.orderListModel[0] productReviews: model
.orderItems[index].product.approvedTotalReviews, .orderListModel[0]
.orderItems[index]
.product
.approvedTotalReviews,
totalPrice: totalPrice:
"${(model.orderListModel[0].orderItems[index].product.price * model.orderListModel[0].orderItems[index].quantity).toStringAsFixed(2)}", "${(model.orderListModel[0].orderItems[index].product.price * model.orderListModel[0].orderItems[index].quantity).toStringAsFixed(2)}",
qyt: model qyt: model.orderListModel[0].orderItems[index]
.orderListModel[0].orderItems[index].quantity .quantity
.toString(), .toString(),
isOrderDetails: true, isOrderDetails: true,
imgs: model.orderListModel[0].orderItems[index] imgs: model.orderListModel[0].orderItems[index]
.product.images != .product.images !=
null && null &&
model.orderListModel[0].orderItems[index] model
.product.images.length != .orderListModel[0]
.orderItems[index]
.product
.images
.length !=
0 0
? model.orderListModel[0].orderItems[index] ? model.orderListModel[0].orderItems[index]
.product.images[0].src .product.images[0].src
.toString() .toString()
: null, : null,
status: model.orderListModel[0].orderStatusId, status: model.orderListModel[0].orderStatusId,
product: product: model.orderListModel[0]
model.orderListModel[0].orderItems[index].product, .orderItems[index].product,
), ),
); );
}), }),
@ -541,14 +542,20 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
model.orderListModel[0].orderStatusId == 10 model.orderListModel[0].orderStatusId == 10
? InkWell( ? InkWell(
onTap: () { onTap: () {
model.makeOrder(); print(widget.orderModel.toString());
print(model.orderListModel.toString());
print("calc = ${5.9 * 3}");
// TODO MOSA
openPayment(
model.orderListModel[0], model.user);
}, },
child: Container( child: Container(
// margin: EdgeInsets.only(top: 20.0), // margin: EdgeInsets.only(top: 20.0),
height: 50.0, height: 50.0,
color: Colors.transparent, color: Colors.transparent,
child: Container( child: Container(
padding: EdgeInsets.only(left: 130.0, right: 130.0), padding: EdgeInsets.only(
left: 130.0, right: 130.0),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
color: Colors.green, color: Colors.green,
@ -573,7 +580,8 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
isCancel isCancel
? InkWell( ? InkWell(
onTap: () { onTap: () {
presentConfirmDialog(model, widget.orderModel.id); presentConfirmDialog(
model, widget.orderModel.id);
// model.orderListModel[0].id//(widget.orderModel.id)); // model.orderListModel[0].id//(widget.orderModel.id));
// //
}, },
@ -606,7 +614,8 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
color: Colors.transparent, color: Colors.transparent,
child: Center( child: Center(
child: Text( child: Text(
TranslationBase.of(context).trackDeliveryDriver, TranslationBase.of(context)
.trackDeliveryDriver,
style: TextStyle( style: TextStyle(
color: Colors.green[900], color: Colors.green[900],
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
@ -619,7 +628,8 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
], ],
), ),
), ),
), )
: Container(),
), ),
); );
} }
@ -701,4 +711,55 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
} }
} }
/***
*
* Online payment methods
*/
openPayment(
OrderDetailModel order,
AuthenticatedUser authenticatedUser,
) {
browser = new MyInAppBrowser(
onExitCallback: onBrowserExit, onLoadStartCallback: onBrowserLoadStart);
browser.openPharmacyPaymentBrowser(
order,
order.orderTotal,
'ePharmacy Order',
order.id,
order.billingAddress.email,
order.customValuesXml,
"${authenticatedUser.firstName} ${authenticatedUser.middleName} ${authenticatedUser.lastName}",
authenticatedUser.patientID,
authenticatedUser,
browser);
}
onBrowserLoadStart(String url) {
print("onBrowserLoadStart");
print(url);
MyInAppBrowser.successURLS.forEach((element) {
if (url.contains(element)) {
if (browser.isOpened()) browser.close();
MyInAppBrowser.isPaymentDone = true;
return;
}
});
MyInAppBrowser.errorURLS.forEach((element) {
if (url.contains(element)) {
if (browser.isOpened()) browser.close();
MyInAppBrowser.isPaymentDone = false;
return;
}
});
}
onBrowserExit(bool isPaymentMade) {
print("onBrowserExit Called!!!!");
// if (isPaymentMade) checkPaymentStatus(appo);
}
} }

@ -1,3 +1,4 @@
import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/order_model_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/order_model_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/profile/profile.dart'; import 'package:diplomaticquarterapp/pages/pharmacy/profile/profile.dart';
@ -12,7 +13,7 @@ import 'package:rating_bar/rating_bar.dart';
import 'package:flutter/src/widgets/image.dart' as flutterImage; import 'package:flutter/src/widgets/image.dart' as flutterImage;
class ProductReviewPage extends StatefulWidget { class ProductReviewPage extends StatefulWidget {
final Product product; final PharmacyProduct product;
ProductReviewPage(this.product); ProductReviewPage(this.product);

@ -1,6 +1,7 @@
import 'dart:async'; import 'dart:async';
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/order_detail.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/order_model.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/order_model.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_polyline_points/flutter_polyline_points.dart'; import 'package:flutter_polyline_points/flutter_polyline_points.dart';
@ -9,7 +10,7 @@ import 'package:location/location.dart';
class TrackDriver extends StatefulWidget { class TrackDriver extends StatefulWidget {
final OrderModel order; final OrderDetailModel order;
TrackDriver({this.order}); TrackDriver({this.order});
@override @override
@ -17,7 +18,7 @@ class TrackDriver extends StatefulWidget {
} }
class _TrackDriverState extends State<TrackDriver> { class _TrackDriverState extends State<TrackDriver> {
OrderModel _order; OrderDetailModel _order;
Completer<GoogleMapController> _controller = Completer(); Completer<GoogleMapController> _controller = Completer();

@ -1,6 +1,8 @@
import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/enum/viewstate.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/product-brands.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/product_detail.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
@ -8,6 +10,7 @@ import 'package:diplomaticquarterapp/widgets/input/text_field.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';
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:flutter/material.dart'; import 'package:flutter/material.dart';
import 'base/base_view.dart'; import 'base/base_view.dart';
@ -45,13 +48,13 @@ class _SearchProductsPageState extends State<SearchProductsPage> {
child: Row( child: Row(
children: [ children: [
Container( Container(
width: MediaQuery.of(context).size.width * 0.79, width: MediaQuery.of(context).size.width * 0.70,
child: Form( child: Form(
key: _formKey, key: _formKey,
child: TextFields( child: TextFields(
autoFocus: true, autoFocus: true,
hintText: 'Search', hintText: 'Search',
fontSize: 19.0, fontSize: 14.5,
prefixIcon: Icon(Icons.search), prefixIcon: Icon(Icons.search),
inputAction: TextInputAction.search, inputAction: TextInputAction.search,
onSaved: (value) { onSaved: (value) {
@ -102,7 +105,8 @@ class _SearchProductsPageState extends State<SearchProductsPage> {
child: NetworkBaseView( child: NetworkBaseView(
baseViewModel: model, baseViewModel: model,
child: model.searchList.isNotEmpty child: model.searchList.isNotEmpty
? Container( ? InkWell(
child: Container(
height: MediaQuery.of(context).size.height * 0.80, height: MediaQuery.of(context).size.height * 0.80,
child: GridView.builder( child: GridView.builder(
//physics: NeverScrollableScrollPhysics(), //physics: NeverScrollableScrollPhysics(),
@ -115,8 +119,10 @@ class _SearchProductsPageState extends State<SearchProductsPage> {
), ),
itemCount: model.searchList.length, itemCount: model.searchList.length,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return Card( return InkWell(
color: model.searchList[index].discountName != child: Card(
color: model.searchList[index]
.discountName !=
null null
? Color(0xffFFFF00) ? Color(0xffFFFF00)
: Colors.white, : Colors.white,
@ -153,7 +159,8 @@ class _SearchProductsPageState extends State<SearchProductsPage> {
padding: padding:
EdgeInsets.symmetric(horizontal: 0), EdgeInsets.symmetric(horizontal: 0),
width: width:
MediaQuery.of(context).size.width / 3, MediaQuery.of(context).size.width /
3,
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
@ -165,10 +172,12 @@ class _SearchProductsPageState extends State<SearchProductsPage> {
0, 16, 0, 0), 0, 16, 0, 0),
alignment: Alignment.center, alignment: Alignment.center,
child: Image.network( child: Image.network(
model.searchList[index].images model.searchList[index]
.isNotEmpty .images.isNotEmpty
? model.searchList[index] ? model
.images[0].thumb .searchList[index]
.images[0]
.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: 80,
@ -186,15 +195,18 @@ class _SearchProductsPageState extends State<SearchProductsPage> {
padding: EdgeInsets.all(4), padding: EdgeInsets.all(4),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xffb23838), color: Color(0xffb23838),
borderRadius: BorderRadius.only( borderRadius:
BorderRadius.only(
topLeft: topLeft:
Radius.circular(6)), Radius.circular(
6)),
), ),
child: Texts( child: Texts(
model.searchList[index] model.searchList[index]
.rxMessage != .rxMessage !=
null null
? model.searchList[index] ? model
.searchList[index]
.rxMessage .rxMessage
: "", : "",
color: Colors.white, color: Colors.white,
@ -215,13 +227,15 @@ class _SearchProductsPageState extends State<SearchProductsPage> {
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
Texts( Texts(
model.searchList[index].name, model
.searchList[index].name,
regular: true, regular: true,
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
), ),
Padding( Padding(
padding: const EdgeInsets.only( padding:
const EdgeInsets.only(
top: 4, bottom: 4), top: 4, bottom: 4),
child: Texts( child: Texts(
"SAR ${model.searchList[index].price}", "SAR ${model.searchList[index].price}",
@ -254,7 +268,8 @@ class _SearchProductsPageState extends State<SearchProductsPage> {
"(${model.searchList[index].approvedTotalReviews})", "(${model.searchList[index].approvedTotalReviews})",
regular: true, regular: true,
fontSize: 10, fontSize: 10,
fontWeight: FontWeight.w400, fontWeight:
FontWeight.w400,
) )
], ],
), ),
@ -264,9 +279,19 @@ class _SearchProductsPageState extends State<SearchProductsPage> {
], ],
), ),
), ),
),
onTap: () => {
Navigator.push(
context,
FadePage(
page: ProductDetailPage(
model.searchList[index]),
)),
},
); );
}, },
), ),
),
) )
: Texts(msg), : Texts(msg),
), ),

@ -1,10 +1,12 @@
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/pages/pharmacies/product_detail.dart';
import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.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';
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:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -607,6 +609,7 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return NetworkBaseView( return NetworkBaseView(
baseViewModel: model, baseViewModel: model,
child: InkWell(
child: Card( child: Card(
color: model.subProducts[index] color: model.subProducts[index]
.discountName != .discountName !=
@ -656,12 +659,17 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
Stack( Stack(
children: [ children: [
Container( Container(
margin: EdgeInsets.fromLTRB( margin:
EdgeInsets.fromLTRB(
0, 16, 0, 0), 0, 16, 0, 0),
alignment: Alignment.center, alignment:
Alignment.center,
child: Image.network( child: Image.network(
model.subProducts[index] model
.images.isNotEmpty .subProducts[
index]
.images
.isNotEmpty
? model ? model
.subProducts[ .subProducts[
index] index]
@ -678,18 +686,22 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
index] index]
.rxMessage != .rxMessage !=
null null
? MediaQuery.of(context) ? MediaQuery.of(
context)
.size .size
.width / .width /
5 5
: 0, : 0,
padding: EdgeInsets.all(4), padding:
EdgeInsets.all(4),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xffb23838), color:
Color(0xffb23838),
borderRadius: borderRadius:
BorderRadius.only( BorderRadius.only(
topLeft: Radius topLeft: Radius
.circular(6)), .circular(
6)),
), ),
child: Texts( child: Texts(
model.subProducts[index] model.subProducts[index]
@ -716,7 +728,8 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
), ),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment
.start,
children: [ children: [
Texts( Texts(
model.subProducts[index] model.subProducts[index]
@ -728,7 +741,8 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
), ),
Padding( Padding(
padding: padding:
const EdgeInsets.only( const EdgeInsets
.only(
top: 4, top: 4,
bottom: 4), bottom: 4),
child: Texts( child: Texts(
@ -769,6 +783,15 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
], ],
), ),
), ),
),
onTap: () => {
Navigator.push(
context,
FadePage(
page: ProductDetailPage(
model.subProducts[index]),
)),
},
)); ));
}, },
), ),
@ -780,7 +803,8 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
itemCount: model.subProducts.length, itemCount: model.subProducts.length,
itemBuilder: itemBuilder:
(BuildContext context, int index) { (BuildContext context, int index) {
return Card( return InkWell(
child: Card(
child: Row( child: Row(
children: [ children: [
Stack( Stack(
@ -788,9 +812,11 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
Column( Column(
children: [ children: [
Container( Container(
decoration: BoxDecoration(), decoration:
BoxDecoration(),
child: Padding( child: Padding(
padding: EdgeInsets.only( padding:
EdgeInsets.only(
left: 9.0, left: 9.0,
top: 8.0, top: 8.0,
right: 10.0, right: 10.0,
@ -798,12 +824,17 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
), ),
), ),
Container( Container(
margin: EdgeInsets.fromLTRB( margin:
EdgeInsets.fromLTRB(
0, 0, 0, 0), 0, 0, 0, 0),
alignment: Alignment.center, alignment:
Alignment.center,
child: Image.network( child: Image.network(
model.subProducts[index] model
.images.isNotEmpty .subProducts[
index]
.images
.isNotEmpty
? model ? model
.subProducts[ .subProducts[
index] index]
@ -824,18 +855,22 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
index] index]
.rxMessage != .rxMessage !=
null null
? MediaQuery.of(context) ? MediaQuery.of(
context)
.size .size
.width / .width /
5 5
: 0, : 0,
padding: EdgeInsets.all(4), padding:
EdgeInsets.all(4),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xffb23838), color:
Color(0xffb23838),
borderRadius: borderRadius:
BorderRadius.only( BorderRadius.only(
topLeft: Radius topLeft: Radius
.circular(6)), .circular(
6)),
), ),
child: Texts( child: Texts(
model.subProducts[index] model.subProducts[index]
@ -865,7 +900,8 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
), ),
child: Column( child: Column(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.spaceAround, MainAxisAlignment
.spaceAround,
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
@ -873,15 +909,19 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
height: 4.0, height: 4.0,
), ),
Container( Container(
height: 35.0, width:
width: 250.0, MediaQuery.of(context)
.size
.width *
0.65,
child: Texts( child: Texts(
model.subProducts[index] model.subProducts[index]
.name, .name,
regular: true, regular: true,
fontSize: 13.2, fontSize: 13.2,
fontWeight: FontWeight.w500, fontWeight:
maxLines: 2, FontWeight.w500,
maxLines: 5,
), ),
), ),
SizedBox( SizedBox(
@ -932,6 +972,15 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
), ),
], ],
), ),
),
onTap: () => {
Navigator.push(
context,
FadePage(
page: ProductDetailPage(
model.subProducts[index]),
)),
},
); );
}), }),
) )

@ -1,6 +1,7 @@
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/order_detail.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/order_model.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/order_model.dart';
import 'package:diplomaticquarterapp/core/service/base_service.dart'; import 'package:diplomaticquarterapp/core/service/base_service.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
@ -16,8 +17,8 @@ class CancelOrderService extends BaseService{
AuthenticatedUser authUser = new AuthenticatedUser(); AuthenticatedUser authUser = new AuthenticatedUser();
AuthProvider authProvider = new AuthProvider(); AuthProvider authProvider = new AuthProvider();
List<OrderModel> _cancelOrderList = List(); List<OrderDetailModel> _cancelOrderList = List();
List<OrderModel> get cancelOrderList => _cancelOrderList; List<OrderDetailModel> get cancelOrderList => _cancelOrderList;
String url =""; String url ="";

@ -1,12 +1,13 @@
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/order_detail.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/order_model.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/order_model.dart';
import 'package:diplomaticquarterapp/core/service/base_service.dart'; import 'package:diplomaticquarterapp/core/service/base_service.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart'; import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:flutter/material.dart';
class OrderDetailsService extends BaseService{ class OrderDetailsService extends BaseService{
@ -16,10 +17,8 @@ class OrderDetailsService extends BaseService{
AuthenticatedUser authUser = new AuthenticatedUser(); AuthenticatedUser authUser = new AuthenticatedUser();
AuthProvider authProvider = new AuthProvider(); AuthProvider authProvider = new AuthProvider();
// String url =""; List<OrderDetailModel> _orderList = List();
// List<OrderModel> get orderDetails => ordeDetails; List<OrderDetailModel> get orderList => _orderList;
List<OrderModel> _orderList = List();
List<OrderModel> get orderList => _orderList;
Future getOrderDetails(OrderId) async { Future getOrderDetails(OrderId) async {
@ -28,7 +27,7 @@ class OrderDetailsService extends BaseService{
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
_orderList.clear(); _orderList.clear();
response['orders'].forEach((item) { response['orders'].forEach((item) {
_orderList.add(OrderModel.fromJson(item)); _orderList.add(OrderDetailModel.fromJson(item));
print(response); print(response);
}); });
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
@ -37,7 +36,7 @@ class OrderDetailsService extends BaseService{
}); });
} }
Future makeReview(Product product, double rating, String reviewText) async { Future makeReview(PharmacyProduct product, double rating, String reviewText) async {
hasError = false; hasError = false;
super.error = ""; super.error = "";

@ -1,6 +1,7 @@
import 'dart:convert'; import 'dart:convert';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/order_detail.dart';
import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart'; import 'package:diplomaticquarterapp/models/Appointments/AppoimentAllHistoryResultList.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart'; import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
@ -20,13 +21,17 @@ class MyInAppBrowser extends InAppBrowser {
// static String PREAUTH_SERVICE_URL = // static String PREAUTH_SERVICE_URL =
// 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort PreAuth Payment Gateway URL Live Store // 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort PreAuth Payment Gateway URL Live Store
static String PRESCRIPTION_PAYMENT_WITH_ORDERID =
'https://uat.hmgwebservices.com/epharmacy/checkout/OpcCompleteRedirectionPaymentClientbyOrder?orderID=';
static List<String> successURLS = [ static List<String> successURLS = [
'success', 'success',
'PayFortResponse', 'PayFortResponse',
'PayFortSucess' 'PayFortSucess',
'mobilepaymentcomplete'
]; ];
static List<String> errorURLS = ['PayfortCancel']; static List<String> errorURLS = ['PayfortCancel', 'errorpage', 'Failed'];
final Function onExitCallback; final Function onExitCallback;
final Function onLoadStartCallback; final Function onLoadStartCallback;
@ -146,6 +151,26 @@ class MyInAppBrowser extends InAppBrowser {
}); });
} }
openPharmacyPaymentBrowser(
OrderDetailModel order,
double amount,
String orderDesc,
String transactionID,
String emailId,
String paymentMethod,
String patientName,
dynamic patientID,
AuthenticatedUser authenticatedUser,
InAppBrowser browser) {
this.browser = browser;
getPatientData();
generatePharmacyURL(order, amount, orderDesc, transactionID, emailId,
paymentMethod, patientName, patientID, authenticatedUser)
.then((value) {
this.browser.openUrl(url: value);
});
}
openBrowser(String url) { openBrowser(String url) {
this.browser = browser; this.browser = browser;
this.browser.openUrl(url: url); this.browser.openUrl(url: url);
@ -225,6 +250,25 @@ class MyInAppBrowser extends InAppBrowser {
return 'data:text/html;base64,' + base64Str; return 'data:text/html;base64,' + base64Str;
} }
Future<String> generatePharmacyURL(
OrderDetailModel order,
double amount,
String orderDesc,
String transactionID,
String emailId,
String paymentMethod,
String patientName,
dynamic patientID,
AuthenticatedUser authUser) async {
String pharmacyURL = PRESCRIPTION_PAYMENT_WITH_ORDERID +
order.orderGuid +
'&&CustomerId=' +
"${order.customerId}";
print(pharmacyURL);
return pharmacyURL;
}
String getForm() { String getForm() {
return '<html> ' + return '<html> ' +
'<head></head>' + '<head></head>' +
@ -292,6 +336,36 @@ class MyInAppBrowser extends InAppBrowser {
'</body>' + '</body>' +
'</html>'; '</html>';
} }
String getPharmacyForm() {
return '<html> ' +
'<head></head>' +
'<body>' +
'<form id="paymentForm" action="SERVICE_URL_VALUE" method="post">' +
'<input type="hidden" name="Amount" value="AMOUNT_VALUE">' +
'<input type="hidden" name="Order_Desc" value="ORDER_DESCRIPTION_VALUE">' +
'<input type="hidden" name="OrderID" value="ORDER_ID_VALUE">' +
'<input type="hidden" name="PaymentOption" value="PAYMENT_OPTION_VALUE">' +
'<input type="hidden" name="Email" value="EMAIL_VALUE">' +
'<input type="hidden" name="ServID" value="SERV_ID" >' +
'<input type="hidden" name="ChannelID" value="2" >' +
'<input type="hidden" name="Lang" value="LANG_VALUE" >' +
'<input type="hidden" name="ReturnURL" value="" >' +
'<input type="hidden" name="CustName" value="CUSTNAME_VALUE" >' +
'<input type="hidden" name="PatientOutSA" value="PATIENT_OUT_SA" >' +
'<input type="hidden" name="PatientTypeID" value="PATIENT_TYPE_ID" >' +
'<input type="hidden" name="DeviceToken" value="DEVICE_TOKEN" >' +
'<input type="hidden" name="Longitude" value="LONGITUDE_VALUE" >' +
'<input type="hidden" name="Latitude" value="LATITUDE_VALUE" >' +
'<input type="hidden" name="Live_ServiceID" value="LIVE_SERVICE_ID" >' +
'<input type="hidden" name="CustID" value="CUSTID_VALUE" >' +
'<input type="hidden" name="ResponseContinueURL" value="http://hmg.com/Documents/success.html" >' +
'<input type="hidden" name="BackClickUrl" value="http://hmg.com/Documents/success.html" >' +
'</form>' +
'<script type="text/javascript"> document.getElementById("paymentForm").submit(); </script>' +
'</body>' +
'</html>';
}
} }
class MyChromeSafariBrowser extends ChromeSafariBrowser { class MyChromeSafariBrowser extends ChromeSafariBrowser {

@ -1,10 +1,9 @@
import 'package:diplomaticquarterapp/core/model/pharmacies/order_model.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-order-page.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/order/ProductReview.dart'; import 'package:diplomaticquarterapp/pages/pharmacy/order/ProductReview.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/src/widgets/image.dart' as flutterImage;
import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:rating_bar/rating_bar.dart'; import 'package:rating_bar/rating_bar.dart';
@ -21,7 +20,7 @@ class productTile extends StatelessWidget {
final String img; final String img;
final String imgs; final String imgs;
final int status; final int status;
final Product product; final PharmacyProduct product;
final dynamic productID; final dynamic productID;
productTile( productTile(

Loading…
Cancel
Save