Commit 6d59afa1 by Neethumol Jose

email , phone is stored in userdefaults in login popup vc

razor pay key id changed to new, json array changed and razor pay worked now
payable amount is stored in userdefaults in my cart vc
count checked in add to cart api in post api service
parent 89f71c5e
...@@ -10,5 +10,13 @@ ...@@ -10,5 +10,13 @@
<integer>12</integer> <integer>12</integer>
</dict> </dict>
</dict> </dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>046618C927EC2CD800D65702</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict> </dict>
</plist> </plist>
...@@ -144,7 +144,8 @@ extension LoginPopVC ...@@ -144,7 +144,8 @@ extension LoginPopVC
self.signupHeaderLabel.text = "OTP Verification" self.signupHeaderLabel.text = "OTP Verification"
self.genderView.isHidden = true self.genderView.isHidden = true
self.genderViewHeight.constant = 0 self.genderViewHeight.constant = 0
self.showSnackBar(Message: ((signinData?.otp ?? "") + " For checking"), duration: .long) //remove the line when backend sent otp to mobile number self.showSnackBar(Message: ((signinData?.otp ?? "") + " For checking"), duration: .long)
//remove the line when backend sent otp to mobile number
} }
else else
{ {
...@@ -202,7 +203,7 @@ extension LoginPopVC ...@@ -202,7 +203,7 @@ extension LoginPopVC
DispatchQueue.main.async { DispatchQueue.main.async {
AppInstance.showLoader() AppInstance.showLoader()
self.loginPopupVM.otpVerification(phone: phoneNumber, otp: otp) self.loginPopupVM.otpVerification(phone: phoneNumber, otp: otp)
self.loginPopupVM.otpData.bind { (otpData) in self.loginPopupVM.otpData.bind { [self] (otpData) in
DispatchQueue.main.async { DispatchQueue.main.async {
AppInstance.hideLoader() AppInstance.hideLoader()
} }
...@@ -210,6 +211,8 @@ extension LoginPopVC ...@@ -210,6 +211,8 @@ extension LoginPopVC
{ {
self.dismiss(animated: false, completion: nil) self.dismiss(animated: false, completion: nil)
UserDefaults.standard.setValue(otpData?.access_token, forKey: "AccessToken") UserDefaults.standard.setValue(otpData?.access_token, forKey: "AccessToken")
UserDefaults.standard.setValue(self.mailText.text, forKey: "email")
UserDefaults.standard.setValue(self.otpPhoneNo, forKey: "phone")
} }
else else
{ {
......
...@@ -23,9 +23,17 @@ class PaymentListVC: UIViewController { ...@@ -23,9 +23,17 @@ class PaymentListVC: UIViewController {
var razorpay: RazorpayCheckout! var razorpay: RazorpayCheckout!
override func viewDidLoad() { override func viewDidLoad() {
razorpay = RazorpayCheckout.initWithKey("rzp_test_tLoJwFd0ujrpZt", andDelegate: self)
super.viewDidLoad() super.viewDidLoad()
razorpay = RazorpayCheckout.initWithKey("rzp_test_FBrsxAj6yDENaI", andDelegate: self)
if #available(iOS 13.0, *){
navigationController?.navigationBar.setNeedsLayout()
print("iOS 13.0, *")
}
} }
override func viewWillAppear(_ animated: Bool) { override func viewWillAppear(_ animated: Bool) {
...@@ -116,7 +124,7 @@ extension PaymentListVC{ ...@@ -116,7 +124,7 @@ extension PaymentListVC{
if orderCreateData?.status == true if orderCreateData?.status == true
{ {
self.showSnackBar(Message: orderCreateData?.message ?? "Something went wrong!!!", duration: .middle) self.showSnackBar(Message: orderCreateData?.message ?? "Something went wrong!!!", duration: .middle)
let orderId = orderCreateData?.order_number let orderId = orderCreateData?.order_id
let payAmnt = UserDefaults.standard.value(forKey: "PayableAmount")as? String let payAmnt = UserDefaults.standard.value(forKey: "PayableAmount")as? String
let email = UserDefaults.standard.value(forKey: "email")as? String let email = UserDefaults.standard.value(forKey: "email")as? String
let phone = UserDefaults.standard.value(forKey: "phone")as? String let phone = UserDefaults.standard.value(forKey: "phone")as? String
...@@ -124,20 +132,21 @@ extension PaymentListVC{ ...@@ -124,20 +132,21 @@ extension PaymentListVC{
let options: [String:Any] = [ let options: [String:Any] = [
"amount": payAmnt, //This is in currency subunits. 100 = 100 paise= INR 1. "amount": payAmnt, //This is in currency subunits. 100 = 100 paise= INR 1.
"currency": "INR",//We support more that 92 international currencies. "currency": "INR",//We support more that 92 international currencies.
"description": "Reference No. #123456" + orderId! , "description": "Reference No. #" + orderId!,
"order_id": orderId, // "order_id": orderId,
"image": "https://s3.amazonaws.com/rzp-mobile/images/rzp.jpg", "image": "https://s3.amazonaws.com/rzp-mobile/images/rzp.jpg",
"name": "Garmentoo", "name": "Garmentoo",
"prefill": [ "prefill": [
"contact": phone, "contact": phone,
"email": email "email": email
], ],
"theme": [ "theme": [
"color": "#3399cc" "color": "#3399cc"
] ]
] ]
DispatchQueue.main.async { DispatchQueue.main.async {
razorpay.open(options) razorpay.open(options,displayController: self)
} }
} }
......
...@@ -131,7 +131,8 @@ extension MyCartVC ...@@ -131,7 +131,8 @@ extension MyCartVC
DispatchQueue.main.async { DispatchQueue.main.async {
self.lblTotalCost.text = "Rs. \(cartData![0].subtotal ?? 0)" self.lblTotalCost.text = "Rs. \(cartData![0].subtotal ?? 0)"
self.lblPayableAmount.text = "Rs. \(cartData![0].grandTotal ?? 0)" self.lblPayableAmount.text = "Rs. \(cartData![0].grandTotal ?? 0)"
UserDefaults.standard.setValue(cartData![0].grandTotal, forKey: "PayableAmount") // UserDefaults.standard.set(cartData![0].grandTotal, forKey: "PayableAmount")
UserDefaults.standard.setValue(String(cartData![0].grandTotal!), forKey: "PayableAmount")
self.cartCountLabel.text = self.cartList.count.description + " items" self.cartCountLabel.text = self.cartList.count.description + " items"
self.cartTable.reloadData() self.cartTable.reloadData()
} }
......
...@@ -95,8 +95,6 @@ extension ProfileVC ...@@ -95,8 +95,6 @@ extension ProfileVC
{ {
self.mailText.text = response.email self.mailText.text = response.email
self.phoneText.text = response.phone self.phoneText.text = response.phone
UserDefaults.standard.setValue(response.email, forKey: "email")
UserDefaults.standard.setValue(response.phone, forKey: "phone")
self.locationText.text = (response.state ?? "") + ", " + (response.country ?? "") self.locationText.text = (response.state ?? "") + ", " + (response.country ?? "")
self.zipcodeText.text = response.postcode self.zipcodeText.text = response.postcode
self.nameText.text = response.name self.nameText.text = response.name
......
...@@ -663,7 +663,13 @@ struct PostApiService { ...@@ -663,7 +663,13 @@ struct PostApiService {
_ = String(data: response.data!, encoding: String.Encoding.utf8) _ = String(data: response.data!, encoding: String.Encoding.utf8)
let responseOBJ = try jsonDecoder.decode([StatusMessageModel].self, from: jsonData) let responseOBJ = try jsonDecoder.decode([StatusMessageModel].self, from: jsonData)
// print(responseOBJ) // print(responseOBJ)
complete(true, responseOBJ, responseOBJ[0].message) if responseOBJ.count > 0 {
complete(true, responseOBJ, responseOBJ[0].message)
} else {
complete(false,[], response.error?.localizedDescription)
}
}catch _{ }catch _{
complete(false,[], response.error?.localizedDescription) complete(false,[], response.error?.localizedDescription)
......
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