diff --git a/Verdnaturaventas/Verdnaturaventas.xcodeproj/project.pbxproj b/Verdnaturaventas/Verdnaturaventas.xcodeproj/project.pbxproj index 0ba0ffc..58b3954 100644 --- a/Verdnaturaventas/Verdnaturaventas.xcodeproj/project.pbxproj +++ b/Verdnaturaventas/Verdnaturaventas.xcodeproj/project.pbxproj @@ -1706,7 +1706,7 @@ "$(PROJECT_DIR)/build/Debug-iphoneos", ); INFOPLIST_FILE = Verdnaturaventas/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.3; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.verdnatura.Verdnaturaventas; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1731,7 +1731,7 @@ "$(PROJECT_DIR)/build/Debug-iphoneos", ); INFOPLIST_FILE = Verdnaturaventas/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.3; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.verdnatura.Verdnaturaventas; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/Verdnaturaventas/Verdnaturaventas.xcworkspace/xcuserdata/enriqueblascoblanquer.xcuserdatad/UserInterfaceState.xcuserstate b/Verdnaturaventas/Verdnaturaventas.xcworkspace/xcuserdata/enriqueblascoblanquer.xcuserdatad/UserInterfaceState.xcuserstate index eb24236..7ffbac1 100644 Binary files a/Verdnaturaventas/Verdnaturaventas.xcworkspace/xcuserdata/enriqueblascoblanquer.xcuserdatad/UserInterfaceState.xcuserstate and b/Verdnaturaventas/Verdnaturaventas.xcworkspace/xcuserdata/enriqueblascoblanquer.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Verdnaturaventas/Verdnaturaventas.xcworkspace/xcuserdata/enriqueblascoblanquer.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Verdnaturaventas/Verdnaturaventas.xcworkspace/xcuserdata/enriqueblascoblanquer.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index ed9a9b4..8eaa441 100644 --- a/Verdnaturaventas/Verdnaturaventas.xcworkspace/xcuserdata/enriqueblascoblanquer.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Verdnaturaventas/Verdnaturaventas.xcworkspace/xcuserdata/enriqueblascoblanquer.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -2,4 +2,22 @@ + + + + + + diff --git a/Verdnaturaventas/Verdnaturaventas/Celdas/CeldaArticuloTags.swift b/Verdnaturaventas/Verdnaturaventas/Celdas/CeldaArticuloTags.swift index f39403d..a1c5143 100644 --- a/Verdnaturaventas/Verdnaturaventas/Celdas/CeldaArticuloTags.swift +++ b/Verdnaturaventas/Verdnaturaventas/Celdas/CeldaArticuloTags.swift @@ -32,7 +32,8 @@ class CeldaArticuloTags: UITableViewCell { imagenArticulo.downloadImage(url) lablArticulo.text = articulo.Article - lblSubName.text = articulo.subName + lblSubName.text = articulo.subName?.uppercased() + if(ControllerPreferences.mostrarPrecios()) { let valueRange = ("\(String(describing: articulo.available!)) \(NSLocalizedString("desde", comment: ""))" as NSString).range(of: "\(String(describing: articulo.available!))") diff --git a/Verdnaturaventas/Verdnaturaventas/Dialog/DialogPagarDeuda.swift b/Verdnaturaventas/Verdnaturaventas/Dialog/DialogPagarDeuda.swift index aaa19c2..474cbe4 100644 --- a/Verdnaturaventas/Verdnaturaventas/Dialog/DialogPagarDeuda.swift +++ b/Verdnaturaventas/Verdnaturaventas/Dialog/DialogPagarDeuda.swift @@ -41,7 +41,10 @@ class DialogPagarDeuda: MyViewVentas { } @IBAction func clickAceptar(_ sender: AnyObject) { - cantidad = Double(editTotal.text!) + let cant = editTotal.text! + let newString = cant.replacingOccurrences(of: ",", with: ".", options: .literal, range: nil) + + cantidad = Double(newString) if(cantidad != nil && cantidad! > 0.0 && cantidad! <= 3000) { launchSegue("segueNavegadorDeuda") diff --git a/Verdnaturaventas/Verdnaturaventas/Facade/FacadeVentasClient.swift b/Verdnaturaventas/Verdnaturaventas/Facade/FacadeVentasClient.swift index b4d45b2..8384a36 100644 --- a/Verdnaturaventas/Verdnaturaventas/Facade/FacadeVentasClient.swift +++ b/Verdnaturaventas/Verdnaturaventas/Facade/FacadeVentasClient.swift @@ -17,7 +17,7 @@ class FacadeVentasClient: FacadeClient, URLSessionDelegate { let HOST = "https://app.verdnatura.es/" //let HOST = "http://www.verdnatura.es/pruebas/" - // let HOST = "http://172.16.198.221:8080/" + // let HOST = "http://172.16.198.221:8080/" override func WriteResponseToStream(_ facade: String, command: String, argsMessage: String!, datos: inout AnyObject?) throws{ diff --git a/Verdnaturaventas/Verdnaturaventas/Info.plist b/Verdnaturaventas/Verdnaturaventas/Info.plist index b8145b3..2e67055 100644 --- a/Verdnaturaventas/Verdnaturaventas/Info.plist +++ b/Verdnaturaventas/Verdnaturaventas/Info.plist @@ -26,11 +26,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.10 + 1.2 CFBundleSignature ???? CFBundleVersion - 15 + 18 LSApplicationCategoryType LSRequiresIPhoneOS diff --git a/Verdnaturaventas/Verdnaturaventas/Main.storyboard b/Verdnaturaventas/Verdnaturaventas/Main.storyboard index 6cd07b3..ace16ac 100644 --- a/Verdnaturaventas/Verdnaturaventas/Main.storyboard +++ b/Verdnaturaventas/Verdnaturaventas/Main.storyboard @@ -998,6 +998,7 @@ + @@ -2577,11 +2578,11 @@ - + - - - + + + diff --git a/Verdnaturaventas/Verdnaturaventas/Views/ViewArticulos.swift b/Verdnaturaventas/Verdnaturaventas/Views/ViewArticulos.swift index 2ea0677..4f62ad1 100644 --- a/Verdnaturaventas/Verdnaturaventas/Views/ViewArticulos.swift +++ b/Verdnaturaventas/Verdnaturaventas/Views/ViewArticulos.swift @@ -101,8 +101,14 @@ class ViewArticulos: MyViewVentas, UITableViewDelegate, UITableViewDataSource { } func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + var val = CGFloat(68 + (articulos[indexPath.row].tags.count * 21)) + print("VALOR \(val)") - return CGFloat(68 + (articulos[indexPath.row].tags.count * 21)) + if val < 155.0 { + val = 155.0 + } + + return val } override func prepare(for segue: UIStoryboardSegue, sender: Any?) { diff --git a/Verdnaturaventas/Verdnaturaventas/Views/ViewMain.swift b/Verdnaturaventas/Verdnaturaventas/Views/ViewMain.swift index d521cd9..e6ca6dd 100644 --- a/Verdnaturaventas/Verdnaturaventas/Views/ViewMain.swift +++ b/Verdnaturaventas/Verdnaturaventas/Views/ViewMain.swift @@ -23,6 +23,7 @@ class ViewMain: MyViewVentas, UICollectionViewDelegate, UICollectionViewDataSour @IBOutlet weak var titleConsignatorio: UILabel! @IBOutlet weak var titleDate: UILabel! @IBOutlet weak var titleAgency: UILabel! + @IBOutlet weak var flechaCliente: UIImageView! let titles = [NSLocalizedString("main_flowers", comment: ""), NSLocalizedString("main_greens", comment: ""), @@ -48,6 +49,13 @@ class ViewMain: MyViewVentas, UICollectionViewDelegate, UICollectionViewDataSour self.titleDate.text = NSLocalizedString("main_arraival", comment: "").uppercased() self.titleAgency.text = NSLocalizedString("main_agency", comment: "").uppercased() saveUserInFirebase() + + + if (self.aplication.cliente?.Tipo)! != "cliente"{ + flechaCliente.isHidden = false + }else{ + flechaCliente.isHidden = true + } } override func viewWillAppear(_ animated: Bool) { @@ -176,10 +184,21 @@ class ViewMain: MyViewVentas, UICollectionViewDelegate, UICollectionViewDataSour let parametros = sender as! ParametrosReino viewFamilias.parametros = parametros }else if (segue.identifier! == "goclientes"){ - let view = segue.destination as! ViewSearch - view.tipo = view.TIPO_CLIENTES + + let view = segue.destination as! ViewSearch + view.tipo = view.TIPO_CLIENTES + } } - + override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool { + if (identifier == "goclientes"){ + if (self.aplication.cliente?.Tipo)! != "cliente"{ + return true + }else{ + return false + } + } + return true + } }