You need to sign in or sign up before continuing.
Commit 3690453d by Neethumol Jose

address populated , values populated in order detail page

access token is passed through authorization in get order detail by order id
parent 8fbf1017
...@@ -122,6 +122,7 @@ extension MyOrdersVC : UICollectionViewDelegate,UICollectionViewDataSource ...@@ -122,6 +122,7 @@ extension MyOrdersVC : UICollectionViewDelegate,UICollectionViewDataSource
categIndex = indexPath.row categIndex = indexPath.row
DispatchQueue.main.async { DispatchQueue.main.async {
self.categCollectionView.reloadData() self.categCollectionView.reloadData()
self.orderListTable.reloadData()
} }
} }
......
...@@ -38,6 +38,7 @@ class OrderDetailPage: UIViewController { ...@@ -38,6 +38,7 @@ class OrderDetailPage: UIViewController {
var orderDetailVM = OrderDetailsFinalVM() var orderDetailVM = OrderDetailsFinalVM()
var orderDetailId: String? var orderDetailId: String?
var iTemsArray: [Items]?
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
...@@ -84,7 +85,7 @@ class OrderDetailPage: UIViewController { ...@@ -84,7 +85,7 @@ class OrderDetailPage: UIViewController {
extension OrderDetailPage : UITableViewDelegate, UITableViewDataSource extension OrderDetailPage : UITableViewDelegate, UITableViewDataSource
{ {
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 3 return iTemsArray?.count ?? 0
} }
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
...@@ -97,6 +98,9 @@ extension OrderDetailPage : UITableViewDelegate, UITableViewDataSource ...@@ -97,6 +98,9 @@ extension OrderDetailPage : UITableViewDelegate, UITableViewDataSource
{ {
cell.addReviewView.isHidden = false cell.addReviewView.isHidden = false
} }
cell.productName.text = iTemsArray![indexPath.row].prd_name
cell.amountLbl.text = String(iTemsArray![indexPath.row].prd_price ?? -1)
cell.addReviewBtn.addTarget(self, action: #selector(reviewOrder(_:)), for: .touchUpInside) cell.addReviewBtn.addTarget(self, action: #selector(reviewOrder(_:)), for: .touchUpInside)
return cell return cell
...@@ -136,18 +140,18 @@ extension OrderDetailPage{ ...@@ -136,18 +140,18 @@ extension OrderDetailPage{
if orderDetalData?.status == true if orderDetalData?.status == true
{ {
statusLabel.text = orderDetalData?.order_data?.order_status statusLabel.text = orderDetalData?.order_data?.order_status
orderIdLbl.text = orderDetalData?.order_data?.order_id orderIdLbl.text = orderDetalData?.order_data?.order_number
orderedDateLbl.text = "20th Jnuary 2023" orderedDateLbl.text = "20th Jnuary 2023"
deliverDateLabel.text = "1st february 2023" deliverDateLabel.text = "1st february 2023"
//deliverAddressHeaderLbl.text = "Delivery to : " + (orderDetalData?.order_data?.customer_firstname)! deliveryAddressLbl.text = """
// deliveryAddressLbl.text = orderDetalData?.order_data!.billing_address_street?.first() + orderDetalData?.order_data!.billing_address_city! + orderDetalData?.order_data!.billing_address_Country_id! + orderDetalData?.order_data!.billing_address_post_code! + orderDetalData?.order_data!.billing_address_telephone! \(orderDetalData?.order_data!.billing_address_street?.first ?? ""),\(orderDetalData?.order_data!.billing_address_city ?? ""),\(orderDetalData?.order_data!.billing_address_Country_id ?? ""),\(orderDetalData?.order_data!.billing_address_post_code ?? ""),\(orderDetalData?.order_data!.billing_address_telephone ?? "")
"""
itemTotalLbl.text = orderDetalData?.order_data?.total_amount itemTotalLbl.text = orderDetalData?.order_data?.total_amount
deliveryChargeLbl.text = orderDetalData?.order_data?.shipping_amount deliveryChargeLbl.text = orderDetalData?.order_data?.shipping_amount
taxGstLbl.text = orderDetalData?.order_data?.tax_amount taxGstLbl.text = orderDetalData?.order_data?.tax_amount
discountLbl.text = orderDetalData?.order_data?.discount discountLbl.text = orderDetalData?.order_data?.discount
totalChargesLbl.text = orderDetalData?.order_data?.sub_total totalChargesLbl.text = orderDetalData?.order_data?.sub_total
iTemsArray = orderDetalData?.order_data?.items
} }
else else
......
...@@ -356,6 +356,7 @@ struct PostApiService { ...@@ -356,6 +356,7 @@ struct PostApiService {
let url = RestApiManager.sharedInstance.baseURL + "/rest/V2/order_view" let url = RestApiManager.sharedInstance.baseURL + "/rest/V2/order_view"
var request = URLRequest(url: NSURL.init(string: url)! as URL) var request = URLRequest(url: NSURL.init(string: url)! as URL)
request.httpMethod = "POST" request.httpMethod = "POST"
request.addValue(self.getAccessToken(), forHTTPHeaderField: "Authorization")
request.addValue("application/json", forHTTPHeaderField: "Content-Type") request.addValue("application/json", forHTTPHeaderField: "Content-Type")
request.httpBody = params request.httpBody = params
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment