mirror of
https://bitbucket.org/vendoo/vendoo_v1.0.git
synced 2025-12-25 03:37:39 +00:00
fixed some small bugs due to integration work
This commit is contained in:
parent
8c39ce11c8
commit
54d2236fac
Binary file not shown.
@ -312,7 +312,7 @@
|
||||
moduleName = "Vendoo"
|
||||
usesParentBreakpointCondition = "Yes"
|
||||
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ListingPreviewViewController.swift"
|
||||
timestampString = "494945565.928084"
|
||||
timestampString = "494947669.046798"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "51"
|
||||
@ -327,7 +327,7 @@
|
||||
moduleName = "Vendoo"
|
||||
usesParentBreakpointCondition = "Yes"
|
||||
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ListingPreviewViewController.swift"
|
||||
timestampString = "494945565.929415"
|
||||
timestampString = "494947669.046896"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "51"
|
||||
@ -342,7 +342,7 @@
|
||||
moduleName = "Vendoo"
|
||||
usesParentBreakpointCondition = "Yes"
|
||||
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ListingPreviewViewController.swift"
|
||||
timestampString = "494945565.929859"
|
||||
timestampString = "494947669.047065"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "51"
|
||||
@ -439,11 +439,11 @@
|
||||
ignoreCount = "0"
|
||||
continueAfterRunningActions = "No"
|
||||
filePath = "Vendoo/CategoriesTableViewController.swift"
|
||||
timestampString = "494940975.718534"
|
||||
timestampString = "494947668.680376"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "764"
|
||||
endingLineNumber = "764"
|
||||
startingLineNumber = "768"
|
||||
endingLineNumber = "768"
|
||||
landmarkName = "prepareForSegue(_:sender:)"
|
||||
landmarkType = "5">
|
||||
</BreakpointContent>
|
||||
@ -535,7 +535,7 @@
|
||||
moduleName = "Vendoo"
|
||||
usesParentBreakpointCondition = "Yes"
|
||||
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ListingPreviewViewController.swift"
|
||||
timestampString = "494945565.960792"
|
||||
timestampString = "494947669.050678"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "402"
|
||||
@ -550,7 +550,7 @@
|
||||
moduleName = "Vendoo"
|
||||
usesParentBreakpointCondition = "Yes"
|
||||
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ListingPreviewViewController.swift"
|
||||
timestampString = "494945565.961124"
|
||||
timestampString = "494947669.050781"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "402"
|
||||
@ -583,7 +583,7 @@
|
||||
moduleName = "Vendoo"
|
||||
usesParentBreakpointCondition = "Yes"
|
||||
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ListingPreviewViewController.swift"
|
||||
timestampString = "494945565.96404"
|
||||
timestampString = "494947669.05145"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "405"
|
||||
@ -598,7 +598,7 @@
|
||||
moduleName = "Vendoo"
|
||||
usesParentBreakpointCondition = "Yes"
|
||||
urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ListingPreviewViewController.swift"
|
||||
timestampString = "494945565.964294"
|
||||
timestampString = "494947669.051623"
|
||||
startingColumnNumber = "9223372036854775807"
|
||||
endingColumnNumber = "9223372036854775807"
|
||||
startingLineNumber = "405"
|
||||
|
||||
@ -697,11 +697,15 @@ class CategoriesTableViewController: UIViewController, UITableViewDelegate, UITa
|
||||
|
||||
if(self.ebayManager.isAuthorized ) {
|
||||
var dict: Dictionary<String, Dictionary<String, AnyObject>> = (EbayWebServiceManager.settingsDictionary["categories"]!) as! Dictionary<String, Dictionary<String, AnyObject>>
|
||||
|
||||
let catDict = dict[self.selectedCategory]
|
||||
if (!(catDict!["isLeaf"] as! Bool)){
|
||||
if (catDict != nil && !(catDict!["isLeaf"] as! Bool)){
|
||||
self.potentialEbay = true
|
||||
self.navigateCategories()
|
||||
}
|
||||
else{
|
||||
self.performSegueWithIdentifier("NetworkSelectionSegue", sender: self)
|
||||
}
|
||||
}
|
||||
else {
|
||||
self.performSegueWithIdentifier("NetworkSelectionSegue", sender: self)
|
||||
|
||||
@ -428,7 +428,6 @@ extension ItemImagePickerViewController {
|
||||
//save listing to private user path in firebase
|
||||
let newListingRef = (self.tabBarController as? HomeViewController)?.firebaseManager.ref.child("Users").child("\(((self.tabBarController as? HomeViewController)?.firebaseManager.user_email)!)").child("user_Listings").childByAutoId()
|
||||
|
||||
let category = (self.pickerData[self.categoryPicker.selectedRowInComponent(0)])
|
||||
var counter = -1
|
||||
for bool in self.itemImagesSelections {
|
||||
if bool {
|
||||
@ -441,7 +440,6 @@ extension ItemImagePickerViewController {
|
||||
"seller email": (NSUserDefaults.standardUserDefaults().objectForKey("email") as? String)!,
|
||||
"listingTitle": self.itemName.text,
|
||||
"listingPrice": self.itemPrice.text,
|
||||
"listingCategory": category,
|
||||
"listingDescription": self.itemDescription.text,
|
||||
"listingQuantity": self.itemQuantity.text!,
|
||||
"numberOfSupportingImages" : counter,
|
||||
|
||||
@ -96,11 +96,11 @@ extension ItemTableViewController {
|
||||
}
|
||||
let dict:[String:AnyObject] = [
|
||||
"pictures": tempImages,
|
||||
"title": self.selectedListing.title,
|
||||
"description": self.selectedListing.desc,
|
||||
"price": self.selectedListing.price,
|
||||
"category": self.selectedListing.category,
|
||||
"quantity": self.selectedListing.quantity
|
||||
"title": self.selectedListing.title != nil ? self.selectedListing.title : "",
|
||||
"description": self.selectedListing.desc != nil ? self.selectedListing.desc: "",
|
||||
"price": self.selectedListing.price != nil ? self.selectedListing.price : "",
|
||||
"category": self.selectedListing.category != nil ? self.selectedListing.category : "",
|
||||
"quantity": self.selectedListing.quantity != nil ? self.selectedListing.quantity: nil
|
||||
]
|
||||
|
||||
des.setDictionary(self.selectedListing.networks, itemdictionary: dict)
|
||||
|
||||
@ -63,6 +63,10 @@ class ListingPreviewViewController: UIViewController {
|
||||
self.publishBtn.enabled = false
|
||||
})
|
||||
}
|
||||
|
||||
/*if(!self.networksDictionary["areNetworksChosen"]!) {
|
||||
self.networks.hidden = true
|
||||
}*/
|
||||
/*else if (self.itemViewState == "Editable") {
|
||||
//self.cancel_backBtn.titleLabel?.text = "Back"
|
||||
|
||||
@ -518,6 +522,7 @@ extension ListingPreviewViewController {
|
||||
|
||||
//notifies once all selected networks have been posted to
|
||||
dispatch_group_notify(postingGroup, dispatch_get_main_queue(), {
|
||||
//self.networksDictionary["areNetworksChosen"] = true
|
||||
self.newInProgressListing.update(["listingID": newListingRef.key,
|
||||
"seller email": (NSUserDefaults.standardUserDefaults().objectForKey("email") as? String)!,
|
||||
"listingTitle": self.itemTitle.text,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user