diff --git a/BaseLibrary/BaseLibrary.xcodeproj/xcuserdata/enriqueblascoblanquer.xcuserdatad/xcschemes/xcschememanagement.plist b/BaseLibrary/BaseLibrary.xcodeproj/xcuserdata/enriqueblascoblanquer.xcuserdatad/xcschemes/xcschememanagement.plist index abe640b..3735d45 100644 --- a/BaseLibrary/BaseLibrary.xcodeproj/xcuserdata/enriqueblascoblanquer.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/BaseLibrary/BaseLibrary.xcodeproj/xcuserdata/enriqueblascoblanquer.xcuserdatad/xcschemes/xcschememanagement.plist @@ -9,6 +9,11 @@ orderHint 16 + BaseLibrary.xcscheme_^#shared#^_ + + orderHint + 16 + diff --git a/Verdnaturaventas/Verdnaturaventas.xcodeproj/project.pbxproj b/Verdnaturaventas/Verdnaturaventas.xcodeproj/project.pbxproj index e5f0044..8cfffc1 100644 --- a/Verdnaturaventas/Verdnaturaventas.xcodeproj/project.pbxproj +++ b/Verdnaturaventas/Verdnaturaventas.xcodeproj/project.pbxproj @@ -225,6 +225,7 @@ A6F581561C6B50AE0003D27F /* CeldaPrecios.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6F581551C6B50AE0003D27F /* CeldaPrecios.swift */; }; A6F581581C6B6AF50003D27F /* DatosCompra.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6F581571C6B6AF50003D27F /* DatosCompra.swift */; }; A6F5815A1C6B76BA0003D27F /* CmdCrearOrder.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6F581591C6B76BA0003D27F /* CmdCrearOrder.swift */; }; + EB225B282271C2FB00D2C2FA /* confeccionarti.png in Resources */ = {isa = PBXBuildFile; fileRef = EB225B262271C2FA00D2C2FA /* confeccionarti.png */; }; EB6BE2B720D118AC00DB6694 /* CmdEliminarPendiente.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB6BE2B620D118AC00DB6694 /* CmdEliminarPendiente.swift */; }; EB6BE2BA20D11B9100DB6694 /* ParserPending.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB6BE2B920D11B9100DB6694 /* ParserPending.swift */; }; EBA55DB42214407100150B88 /* mascotas.png in Resources */ = {isa = PBXBuildFile; fileRef = EBA55DB22214407100150B88 /* mascotas.png */; }; @@ -524,6 +525,7 @@ A6F581591C6B76BA0003D27F /* CmdCrearOrder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CmdCrearOrder.swift; path = Command/CmdCrearOrder.swift; sourceTree = ""; }; B647C6A9CB3F3C82972443BF /* Pods_Verdnaturaventas.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Verdnaturaventas.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D88084E26A228A358E419BD7 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + EB225B262271C2FA00D2C2FA /* confeccionarti.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = confeccionarti.png; sourceTree = ""; }; EB6BE2B620D118AC00DB6694 /* CmdEliminarPendiente.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CmdEliminarPendiente.swift; sourceTree = ""; }; EB6BE2B920D11B9100DB6694 /* ParserPending.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParserPending.swift; sourceTree = ""; }; EB973E5C21DF49490022757D /* Verdnaturaventas.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Verdnaturaventas.entitlements; sourceTree = ""; }; @@ -755,6 +757,7 @@ A69CEDCD1C3A92CA00482F9B /* Images */ = { isa = PBXGroup; children = ( + EB225B262271C2FA00D2C2FA /* confeccionarti.png */, EBA55DB22214407100150B88 /* mascotas.png */, A6AEC0231CABE59F00807AA3 /* noimagen-01.png */, A676F1551C9187DE00C0D751 /* 120.png */, @@ -1251,6 +1254,7 @@ A676F13C1C917F1400C0D751 /* micuenta_fill25.png in Resources */, EBA55DB42214407100150B88 /* mascotas.png in Resources */, A6366C801C90507000EF8470 /* Raleway-Light.ttf in Resources */, + EB225B282271C2FB00D2C2FA /* confeccionarti.png in Resources */, A6F5814E1C6B11480003D27F /* cancel1.png in Resources */, A676F1321C917D1000C0D751 /* mispagos75.png in Resources */, A676F1181C914B8B00C0D751 /* carrito_fill25.png in Resources */, diff --git a/Verdnaturaventas/Verdnaturaventas.xcodeproj/xcuserdata/enriqueblascoblanquer.xcuserdatad/xcschemes/xcschememanagement.plist b/Verdnaturaventas/Verdnaturaventas.xcodeproj/xcuserdata/enriqueblascoblanquer.xcuserdatad/xcschemes/xcschememanagement.plist index ebde8ce..f3f13d6 100644 --- a/Verdnaturaventas/Verdnaturaventas.xcodeproj/xcuserdata/enriqueblascoblanquer.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Verdnaturaventas/Verdnaturaventas.xcodeproj/xcuserdata/enriqueblascoblanquer.xcuserdatad/xcschemes/xcschememanagement.plist @@ -9,6 +9,11 @@ orderHint 15 + Verdnaturaventas.xcscheme_^#shared#^_ + + orderHint + 15 + diff --git a/Verdnaturaventas/Verdnaturaventas.xcworkspace/xcuserdata/enriqueblascoblanquer.xcuserdatad/UserInterfaceState.xcuserstate b/Verdnaturaventas/Verdnaturaventas.xcworkspace/xcuserdata/enriqueblascoblanquer.xcuserdatad/UserInterfaceState.xcuserstate index 07ea4e2..3d86e02 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 8eaa441..ed9a9b4 100644 --- a/Verdnaturaventas/Verdnaturaventas.xcworkspace/xcuserdata/enriqueblascoblanquer.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Verdnaturaventas/Verdnaturaventas.xcworkspace/xcuserdata/enriqueblascoblanquer.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -2,22 +2,4 @@ - - - - - - diff --git a/Verdnaturaventas/Verdnaturaventas/Facade/FacadeVentas.swift b/Verdnaturaventas/Verdnaturaventas/Facade/FacadeVentas.swift index 078ff19..b6b7491 100644 --- a/Verdnaturaventas/Verdnaturaventas/Facade/FacadeVentas.swift +++ b/Verdnaturaventas/Verdnaturaventas/Facade/FacadeVentas.swift @@ -36,7 +36,7 @@ class FacadeVentas: FacadeBase { func ObtenerAgencias(_ fecha: String, consignatario: NSNumber) throws -> Array { - return try Execute(ParserAgencias(), command: Commands.obtener_agencias, args: fecha as AnyObject, consignatario) as! Array + return try Execute(ParserAgencias(), command: Commands.obtener_agencias, args: fecha as AnyObject, consignatario) as! Array } func ObtenerPedidosPendientes(_ cliente: NSNumber) throws -> Array diff --git a/Verdnaturaventas/Verdnaturaventas/Facade/FacadeVentasClient.swift b/Verdnaturaventas/Verdnaturaventas/Facade/FacadeVentasClient.swift index 73a5c33..070b5a0 100644 --- a/Verdnaturaventas/Verdnaturaventas/Facade/FacadeVentasClient.swift +++ b/Verdnaturaventas/Verdnaturaventas/Facade/FacadeVentasClient.swift @@ -15,9 +15,9 @@ class FacadeVentasClient: FacadeClient, URLSessionDelegate { static let instance = FacadeVentasClient() - let HOST = "https://app.verdnatura.es/" + //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 1bafaf4..8f8ae6a 100644 --- a/Verdnaturaventas/Verdnaturaventas/Info.plist +++ b/Verdnaturaventas/Verdnaturaventas/Info.plist @@ -26,11 +26,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.31 + 1.32 CFBundleSignature ???? CFBundleVersion - 21 + 22 LSApplicationCategoryType LSRequiresIPhoneOS diff --git a/Verdnaturaventas/Verdnaturaventas/Main.storyboard b/Verdnaturaventas/Verdnaturaventas/Main.storyboard index d158513..924f524 100644 --- a/Verdnaturaventas/Verdnaturaventas/Main.storyboard +++ b/Verdnaturaventas/Verdnaturaventas/Main.storyboard @@ -1,11 +1,12 @@ - + - + + @@ -318,7 +319,7 @@