verdnatura/vn-ios
verdnatura
/
vn-ios
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

solved some problems

This commit is contained in:
quique 2019-01-17 13:39:06 +01:00
parent 1ebed187e4
commit 5d34218f73
10 changed files with 63 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Verdnaturaventas/Verdnaturaventas.xcodeproj/project.pbxproj
View File

@ -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)";

BIN
Verdnaturaventas/Verdnaturaventas.xcworkspace/xcuserdata/enriqueblascoblanquer.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

18
Verdnaturaventas/Verdnaturaventas.xcworkspace/xcuserdata/enriqueblascoblanquer.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View File

@ -2,4 +2,22 @@
<Bucket
type = "0"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Verdnaturaventas/Dialog/DialogPagarDeuda.swift"
timestampString = "568877971.5768321"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "47"
endingLineNumber = "47"
landmarkName = "clickAceptar(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>

3
Verdnaturaventas/Verdnaturaventas/Celdas/CeldaArticuloTags.swift
View File

@ -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!))")

5
Verdnaturaventas/Verdnaturaventas/Dialog/DialogPagarDeuda.swift
View File

@ -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")

2
Verdnaturaventas/Verdnaturaventas/Facade/FacadeVentasClient.swift
View File

@ -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{

4
Verdnaturaventas/Verdnaturaventas/Info.plist
View File

@ -26,11 +26,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.10</string>
<string>1.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>15</string>
<string>18</string>
<key>LSApplicationCategoryType</key>
<string></string>
<key>LSRequiresIPhoneOS</key>

9
Verdnaturaventas/Verdnaturaventas/Main.storyboard
View File

@ -998,6 +998,7 @@
<connections>
<outlet property="btnPendientes" destination="K9e-Ts-MVy" id="R4e-Md-jLe"/>
<outlet property="collectionBotones" destination="yuC-S6-rCb" id="N1C-dm-4Z7"/>
<outlet property="flechaCliente" destination="une-wJ-oCw" id="qdw-EW-LFs"/>
<outlet property="lablAgency" destination="uB3-cI-FP1" id="qVB-NS-3k5"/>
<outlet property="lablClient" destination="zgP-3r-qGb" id="5C3-jf-vtv"/>
<outlet property="lablDate" destination="uyj-Yp-xHz" id="elB-Ye-Zwb"/>
@ -2577,11 +2578,11 @@
</resources>
<inferredMetricsTieBreakers>
<segue reference="XU7-TS-pTy"/>
<segue reference="3gV-oh-Xuw"/>
<segue reference="18S-Hs-oUA"/>
<segue reference="SDf-Ps-jKc"/>
<segue reference="d1k-z9-Efa"/>
<segue reference="BzB-0S-ce4"/>
<segue reference="cBn-5s-ahV"/>
<segue reference="vSc-oZ-yZF"/>
<segue reference="kNE-BM-XEL"/>
<segue reference="YHl-42-RSG"/>
<segue reference="ZHL-wy-ACl"/>
<segue reference="3Tp-NH-MhI"/>
<segue reference="FOa-0a-cby"/>

8
Verdnaturaventas/Verdnaturaventas/Views/ViewArticulos.swift
View File

@ -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?) {

25
Verdnaturaventas/Verdnaturaventas/Views/ViewMain.swift
View File

@ -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
}
}