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

copia vacaciones

This commit is contained in:
quique 2019-07-31 12:13:39 +02:00
parent 2aa0f132cf
commit 561a2cc951
17 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BaseLibrary/BaseLibrary.xcodeproj/xcuserdata/enriqueblascoblanquer.xcuserdatad/xcschemes/xcschememanagement.plist
View File

@ -9,6 +9,11 @@
<key>orderHint</key>
<integer>16</integer>
</dict>
<key>BaseLibrary.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>16</integer>
</dict>
</dict>
</dict>
</plist>

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

@ -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 = "<group>"; };
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 = "<group>"; };
EB6BE2B620D118AC00DB6694 /* CmdEliminarPendiente.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CmdEliminarPendiente.swift; sourceTree = "<group>"; };
EB6BE2B920D11B9100DB6694 /* ParserPending.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParserPending.swift; sourceTree = "<group>"; };
EB973E5C21DF49490022757D /* Verdnaturaventas.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Verdnaturaventas.entitlements; sourceTree = "<group>"; };
@ -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 */,

5
Verdnaturaventas/Verdnaturaventas.xcodeproj/xcuserdata/enriqueblascoblanquer.xcuserdatad/xcschemes/xcschememanagement.plist
View File

@ -9,6 +9,11 @@
<key>orderHint</key>
<integer>15</integer>
</dict>
<key>Verdnaturaventas.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>15</integer>
</dict>
</dict>
</dict>
</plist>

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,22 +2,4 @@
<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>

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

@ -36,7 +36,7 @@ class FacadeVentas: FacadeBase {
func ObtenerAgencias(_ fecha: String, consignatario: NSNumber) throws -> Array<Agencia>
{
return try Execute(ParserAgencias(), command: Commands.obtener_agencias, args: fecha as AnyObject, consignatario) as! Array<Agencia>
return try Execute(ParserAgencias(), command: Commands.obtener_agencias, args: fecha as AnyObject, consignatario) as! Array<Agencia>
}
func ObtenerPedidosPendientes(_ cliente: NSNumber) throws -> Array<OrderResumen>

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

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

4
Verdnaturaventas/Verdnaturaventas/Info.plist
View File

@ -26,11 +26,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.31</string>
<string>1.32</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>21</string>
<string>22</string>
<key>LSApplicationCategoryType</key>
<string></string>
<key>LSRequiresIPhoneOS</key>

39
Verdnaturaventas/Verdnaturaventas/Main.storyboard
View File

@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="Vcy-Wo-PB3">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="Vcy-Wo-PB3">
<device id="retina4_0" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
@ -318,7 +319,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wpn-Qt-7HE">
<rect key="frame" x="15" y="0.0" width="290" height="29.5"/>
<rect key="frame" x="15" y="0.0" width="290" height="30"/>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="20"/>
<color key="textColor" red="0.62860941889999999" green="0.62909907099999995" blue="0.62868529559999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
@ -1450,13 +1451,13 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B7l-qK-pv9">
<rect key="frame" x="59" y="22" width="227" height="15.5"/>
<rect key="frame" x="70" y="22" width="216" height="15.5"/>
<fontDescription key="fontDescription" name="Raleway" family="Raleway" pointSize="18"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Envios" translatesAutoresizingMaskIntoConstraints="NO" id="MDf-fZ-pqf">
<rect key="frame" x="16" y="15" width="14" height="29.5"/>
<rect key="frame" x="16" y="15" width="25" height="29.5"/>
</imageView>
</subviews>
<constraints>
@ -2558,22 +2559,22 @@
</scene>
</scenes>
<resources>
<image name="BackButton" width="12.472440719604492" height="12.472440719604492"/>
<image name="Buscar" width="14.17322826385498" height="14.17322826385498"/>
<image name="Buscar_fill" width="14.17322826385498" height="14.17322826385498"/>
<image name="Carrito" width="14.17322826385498" height="14.17322826385498"/>
<image name="Carrito_fill" width="14.17322826385498" height="14.17322826385498"/>
<image name="Cuenta" width="14.17322826385498" height="14.17322826385498"/>
<image name="Cuenta_fill" width="14.17322826385498" height="14.17322826385498"/>
<image name="Envios" width="14.17322826385498" height="14.17322826385498"/>
<image name="Home" width="14.17322826385498" height="14.17322826385498"/>
<image name="Home_fill" width="14.17322826385498" height="14.17322826385498"/>
<image name="BackButton" width="22" height="22"/>
<image name="Buscar" width="25" height="25"/>
<image name="Buscar_fill" width="25" height="25"/>
<image name="Carrito" width="25" height="25"/>
<image name="Carrito_fill" width="25" height="25"/>
<image name="Cuenta" width="25" height="25"/>
<image name="Cuenta_fill" width="25" height="25"/>
<image name="Envios" width="25" height="25"/>
<image name="Home" width="25" height="25"/>
<image name="Home_fill" width="25" height="25"/>
<image name="Login-01.jpg" width="1778" height="3156"/>
<image name="Login.png" width="558" height="135"/>
<image name="OcultarPrecios" width="14.17322826385498" height="14.17322826385498"/>
<image name="Pagos" width="14.17322826385498" height="14.17322826385498"/>
<image name="Salir" width="14.17322826385498" height="14.17322826385498"/>
<image name="Tick" width="14.17322826385498" height="14.17322826385498"/>
<image name="OcultarPrecios" width="25" height="25"/>
<image name="Pagos" width="25" height="25"/>
<image name="Salir" width="25" height="25"/>
<image name="Tick" width="25" height="25"/>
<image name="disclouser.png" width="66" height="66"/>
</resources>
<inferredMetricsTieBreakers>

6
Verdnaturaventas/Verdnaturaventas/Static/Colors.swift
View File

@ -17,6 +17,7 @@ class Colors: NSObject {
static let artificial: UInt = 0xff9800
static let manufacturing: UInt = 0x795548
static let pets: UInt = 0x6b529c
static let handmade: UInt = 0x2f4bc2
static let darkFlowers: UInt = 0x501212
static let darkGreens: UInt = 0x827717
@ -25,12 +26,13 @@ class Colors: NSObject {
static let darkArtificial: UInt = 0xe65100
static let darkManufacturing: UInt = 0x3e2723
static let darkPets: UInt = 0x413063
static let darkHandmade: UInt = 0x061f84
static let white: UInt = 0xFFFFFF
static let verdnatura: UInt = 0xA8D52A
static let colors = [Values.FLORES: flowers, Values.VERDES: greens, Values.PLANTAS: plants, Values.ARTIFICIAL: artificial, Values.COMPLEMENTOS: supplements, Values.CONFECCION: manufacturing, Values.MASCOTAS: pets]
static let colors = [Values.FLORES: flowers, Values.VERDES: greens, Values.PLANTAS: plants, Values.ARTIFICIAL: artificial, Values.COMPLEMENTOS: supplements, Values.CONFECCION: manufacturing, Values.MASCOTAS: pets,Values.HANDMADE: handmade]
static let darks = [Values.FLORES: darkFlowers, Values.VERDES: darkGreens, Values.PLANTAS: darkPlants, Values.ARTIFICIAL: darkArtificial, Values.COMPLEMENTOS: darkSupplements, Values.CONFECCION: darkManufacturing, Values.MASCOTAS: darkPets]
static let darks = [Values.FLORES: darkFlowers, Values.VERDES: darkGreens, Values.PLANTAS: darkPlants, Values.ARTIFICIAL: darkArtificial, Values.COMPLEMENTOS: darkSupplements, Values.CONFECCION: darkManufacturing, Values.MASCOTAS: darkPets,Values.HANDMADE: darkHandmade]
}

1
Verdnaturaventas/Verdnaturaventas/Static/Values.swift
View File

@ -21,6 +21,7 @@ class Values: NSObject {
static let VERDES = 5
static let CONFECCION = 7
static let MASCOTAS = 9
static let HANDMADE = 10
static let CALLBACK_PAGO_OK = "http://ok/"
static let CALLBACK_PAGO_ERROR = "http://error/"

BIN
Verdnaturaventas/Verdnaturaventas/Strings/ca.lproj/Localizable.strings
View File

Binary file not shown.

BIN
Verdnaturaventas/Verdnaturaventas/Strings/en.lproj/Localizable.strings
View File

Binary file not shown.

BIN
Verdnaturaventas/Verdnaturaventas/Strings/es.lproj/Localizable.strings
View File

Binary file not shown.

BIN
Verdnaturaventas/Verdnaturaventas/Strings/pt.lproj/Localizable.strings
View File

Binary file not shown.

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

@ -31,12 +31,12 @@ class ViewMain: MyViewVentas, UICollectionViewDelegate, UICollectionViewDataSour
NSLocalizedString("main_artificial", comment: ""),
NSLocalizedString("main_supplements", comment: ""),
NSLocalizedString("main_manufacturing", comment: ""),
"",
NSLocalizedString("mascotas", comment: "")]
NSLocalizedString("mascotas", comment: ""),
NSLocalizedString("confeccionarti", comment: "")]
let images = ["flor.png", "verde.png", "planta.png", "artificial.png", "complemento.png", "confeccion.png","nofoto.png", "mascotas.png"]
let images = ["flor.png", "verde.png", "planta.png", "artificial.png", "complemento.png", "confeccion.png", "mascotas.png", "confeccionarti.png"]
let ids = [Values.FLORES, Values.VERDES, Values.PLANTAS, Values.ARTIFICIAL, Values.COMPLEMENTOS, Values.CONFECCION, Values.MASCOTAS,Values.MASCOTAS]
let ids = [Values.FLORES, Values.VERDES, Values.PLANTAS, Values.ARTIFICIAL, Values.COMPLEMENTOS, Values.CONFECCION, Values.MASCOTAS,Values.HANDMADE]
let db = Firestore.firestore()
var isIphone5 = false

BIN
Verdnaturaventas/Verdnaturaventas/confeccionarti.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 165 KiB