nuevos reinos

This commit is contained in:
quique 2019-09-20 08:00:51 +02:00
parent 1771ed414c
commit 4db4fb0f97
12 changed files with 67 additions and 60 deletions

View File

@ -228,6 +228,7 @@
EB225B282271C2FB00D2C2FA /* confeccionarti.png in Resources */ = {isa = PBXBuildFile; fileRef = EB225B262271C2FA00D2C2FA /* confeccionarti.png */; }; EB225B282271C2FB00D2C2FA /* confeccionarti.png in Resources */ = {isa = PBXBuildFile; fileRef = EB225B262271C2FA00D2C2FA /* confeccionarti.png */; };
EB6BE2B720D118AC00DB6694 /* CmdEliminarPendiente.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB6BE2B620D118AC00DB6694 /* CmdEliminarPendiente.swift */; }; EB6BE2B720D118AC00DB6694 /* CmdEliminarPendiente.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB6BE2B620D118AC00DB6694 /* CmdEliminarPendiente.swift */; };
EB6BE2BA20D11B9100DB6694 /* ParserPending.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB6BE2B920D11B9100DB6694 /* ParserPending.swift */; }; EB6BE2BA20D11B9100DB6694 /* ParserPending.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB6BE2B920D11B9100DB6694 /* ParserPending.swift */; };
EB7F025823349C750018A5CF /* fruta.png in Resources */ = {isa = PBXBuildFile; fileRef = EB7F025623349C740018A5CF /* fruta.png */; };
EBA55DB42214407100150B88 /* mascotas.png in Resources */ = {isa = PBXBuildFile; fileRef = EBA55DB22214407100150B88 /* mascotas.png */; }; EBA55DB42214407100150B88 /* mascotas.png in Resources */ = {isa = PBXBuildFile; fileRef = EBA55DB22214407100150B88 /* mascotas.png */; };
EBA55DB62214416D00150B88 /* nofoto.png in Resources */ = {isa = PBXBuildFile; fileRef = EBA55DB52214416D00150B88 /* nofoto.png */; }; EBA55DB62214416D00150B88 /* nofoto.png in Resources */ = {isa = PBXBuildFile; fileRef = EBA55DB52214416D00150B88 /* nofoto.png */; };
EBC0940721DCB27200FF9C23 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = EBC0940621DCB27200FF9C23 /* GoogleService-Info.plist */; }; EBC0940721DCB27200FF9C23 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = EBC0940621DCB27200FF9C23 /* GoogleService-Info.plist */; };
@ -528,6 +529,7 @@
EB225B262271C2FA00D2C2FA /* confeccionarti.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = confeccionarti.png; sourceTree = "<group>"; }; 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>"; }; 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>"; }; EB6BE2B920D11B9100DB6694 /* ParserPending.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParserPending.swift; sourceTree = "<group>"; };
EB7F025623349C740018A5CF /* fruta.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fruta.png; sourceTree = "<group>"; };
EB973E5C21DF49490022757D /* Verdnaturaventas.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Verdnaturaventas.entitlements; sourceTree = "<group>"; }; EB973E5C21DF49490022757D /* Verdnaturaventas.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Verdnaturaventas.entitlements; sourceTree = "<group>"; };
EBA55DB22214407100150B88 /* mascotas.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mascotas.png; sourceTree = "<group>"; }; EBA55DB22214407100150B88 /* mascotas.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mascotas.png; sourceTree = "<group>"; };
EBA55DB52214416D00150B88 /* nofoto.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = nofoto.png; sourceTree = "<group>"; }; EBA55DB52214416D00150B88 /* nofoto.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = nofoto.png; sourceTree = "<group>"; };
@ -757,6 +759,7 @@
A69CEDCD1C3A92CA00482F9B /* Images */ = { A69CEDCD1C3A92CA00482F9B /* Images */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
EB7F025623349C740018A5CF /* fruta.png */,
EB225B262271C2FA00D2C2FA /* confeccionarti.png */, EB225B262271C2FA00D2C2FA /* confeccionarti.png */,
EBA55DB22214407100150B88 /* mascotas.png */, EBA55DB22214407100150B88 /* mascotas.png */,
A6AEC0231CABE59F00807AA3 /* noimagen-01.png */, A6AEC0231CABE59F00807AA3 /* noimagen-01.png */,
@ -1218,6 +1221,7 @@
A676F1121C91496900C0D751 /* inicio_fill50.png in Resources */, A676F1121C91496900C0D751 /* inicio_fill50.png in Resources */,
A67B6DC81C902D3000F03F3F /* inicio25.png in Resources */, A67B6DC81C902D3000F03F3F /* inicio25.png in Resources */,
A6AE405C1C7EF17500C6FE6C /* back66.png in Resources */, A6AE405C1C7EF17500C6FE6C /* back66.png in Resources */,
EB7F025823349C750018A5CF /* fruta.png in Resources */,
A676F1481C91802C00C0D751 /* buscar25.png in Resources */, A676F1481C91802C00C0D751 /* buscar25.png in Resources */,
A6AEC0241CABE59F00807AA3 /* noimagen-01.png in Resources */, A6AEC0241CABE59F00807AA3 /* noimagen-01.png in Resources */,
A676F14A1C91802C00C0D751 /* buscar75.png in Resources */, A676F14A1C91802C00C0D751 /* buscar75.png in Resources */,

View File

@ -15,9 +15,9 @@ class FacadeVentasClient: FacadeClient, URLSessionDelegate {
static let instance = FacadeVentasClient() 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://www.verdnatura.es/pruebas/"
let HOST = "http://172.16.5.68:8080/" //let HOST = "http://172.20.202.248:8080/"
override func WriteResponseToStream(_ facade: String, command: String, argsMessage: String!, datos: inout AnyObject?) throws{ override func WriteResponseToStream(_ facade: String, command: String, argsMessage: String!, datos: inout AnyObject?) throws{

View File

@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="Vcy-Wo-PB3">
<device id="retina4_0" orientation="portrait"> <device id="retina4_0" orientation="portrait">
<adaptation id="fullscreen"/> <adaptation id="fullscreen"/>
</device> </device>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<customFonts key="customFonts"> <customFonts key="customFonts">
@ -158,7 +157,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="1772.8" y="517.24137931034488"/> <point key="canvasLocation" x="2836.48" y="465.28459907977054"/>
</scene> </scene>
<!--View Order Resume--> <!--View Order Resume-->
<scene sceneID="KXE-Uh-tgT"> <scene sceneID="KXE-Uh-tgT">
@ -217,7 +216,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="YbM-HU-uA2" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="YbM-HU-uA2" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="4316.8000000000002" y="-152.92353823088456"/> <point key="canvasLocation" x="6906.8800000000001" y="-137.56240320619301"/>
</scene> </scene>
<!--View Articulos--> <!--View Articulos-->
<scene sceneID="ZXe-uM-Suu"> <scene sceneID="ZXe-uM-Suu">
@ -285,7 +284,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="WGp-MI-0wf" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="WGp-MI-0wf" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="3267.1999999999998" y="-1495.9520239880062"/> <point key="canvasLocation" x="5227.5199999999995" y="-1345.683979599406"/>
</scene> </scene>
<!--View Detalle Articulo--> <!--View Detalle Articulo-->
<scene sceneID="92f-5F-Bef"> <scene sceneID="92f-5F-Bef">
@ -319,7 +318,7 @@
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <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"> <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="30"/> <rect key="frame" x="15" y="0.0" width="290" height="29.5"/>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="20"/> <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"/> <color key="textColor" red="0.62860941889999999" green="0.62909907099999995" blue="0.62868529559999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
@ -429,7 +428,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="B1X-vR-N4f" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="B1X-vR-N4f" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="4516.8000000000002" y="-1410.4947526236883"/> <point key="canvasLocation" x="7226.8800000000001" y="-1268.8108719253569"/>
</scene> </scene>
<!--View Image--> <!--View Image-->
<scene sceneID="Muj-QU-9ZE"> <scene sceneID="Muj-QU-9ZE">
@ -481,7 +480,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="o3Z-LZ-FSr" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="o3Z-LZ-FSr" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="4265.6000000000004" y="2621.2893553223389"/> <point key="canvasLocation" x="6824.9600000000009" y="2357.9814290755676"/>
</scene> </scene>
<!--Dialog Precios--> <!--Dialog Precios-->
<scene sceneID="h74-NQ-V7n"> <scene sceneID="h74-NQ-V7n">
@ -555,7 +554,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Nuh-dI-YbJ" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="Nuh-dI-YbJ" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="5568" y="-1746.9265367316343"/> <point key="canvasLocation" x="8908.7999999999993" y="-1571.4481589789816"/>
</scene> </scene>
<!--Dialog Agencias--> <!--Dialog Agencias-->
<scene sceneID="zBJ-pe-2bq"> <scene sceneID="zBJ-pe-2bq">
@ -605,7 +604,7 @@
</connections> </connections>
</tapGestureRecognizer> </tapGestureRecognizer>
</objects> </objects>
<point key="canvasLocation" x="5992" y="-1148.7256371814094"/> <point key="canvasLocation" x="9587.2000000000007" y="-1033.3364052606382"/>
</scene> </scene>
<!--Dialog Consignatarios--> <!--Dialog Consignatarios-->
<scene sceneID="9wM-DD-Rme"> <scene sceneID="9wM-DD-Rme">
@ -644,7 +643,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="qaX-54-Sov" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="qaX-54-Sov" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="6593.6000000000004" y="-814.99250374812596"/> <point key="canvasLocation" x="10549.76" y="-733.12669002829932"/>
</scene> </scene>
<!--Data Source--> <!--Data Source-->
<scene sceneID="5hh-QJ-dls"> <scene sceneID="5hh-QJ-dls">
@ -694,7 +693,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="lnp-s0-abW" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="lnp-s0-abW" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="5269" y="-981"/> <point key="canvasLocation" x="8430.3999999999996" y="-882.45877061469275"/>
</scene> </scene>
<!--View Familias--> <!--View Familias-->
<scene sceneID="PHK-M8-XWq"> <scene sceneID="PHK-M8-XWq">
@ -740,7 +739,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="JPb-4H-EwS" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="JPb-4H-EwS" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="2588.8000000000002" y="-1495.0524737631185"/> <point key="canvasLocation" x="4142.0799999999999" y="-1344.8747889923106"/>
</scene> </scene>
<!--View Main--> <!--View Main-->
<scene sceneID="b8b-zd-v2a"> <scene sceneID="b8b-zd-v2a">
@ -1024,7 +1023,7 @@
</connections> </connections>
</tapGestureRecognizer> </tapGestureRecognizer>
</objects> </objects>
<point key="canvasLocation" x="3266.25" y="-826.05633802816908"/> <point key="canvasLocation" x="5226" y="-743.07916464303071"/>
</scene> </scene>
<!--View Listado Pedidos Pendientes--> <!--View Listado Pedidos Pendientes-->
<scene sceneID="gID-Gk-Dfw"> <scene sceneID="gID-Gk-Dfw">
@ -1076,7 +1075,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="jay-S0-9pV" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="jay-S0-9pV" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="2088" y="-152.92353823088456"/> <point key="canvasLocation" x="3340.8000000000002" y="-137.56240320619301"/>
</scene> </scene>
<!--View Resumen Pedido--> <!--View Resumen Pedido-->
<scene sceneID="xLJ-yZ-TW4"> <scene sceneID="xLJ-yZ-TW4">
@ -1261,7 +1260,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="tl9-Fj-r27" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="tl9-Fj-r27" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="3214.4000000000001" y="-152.92353823088456"/> <point key="canvasLocation" x="5143.04" y="-137.56240320619301"/>
</scene> </scene>
<!--View Precios Recalculados--> <!--View Precios Recalculados-->
<scene sceneID="OrD-jF-Qf1"> <scene sceneID="OrD-jF-Qf1">
@ -1305,7 +1304,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="EWK-Ly-uep" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="EWK-Ly-uep" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="5724.8000000000002" y="-101.64917541229386"/> <point key="canvasLocation" x="9159.6800000000003" y="-91.438538601763597"/>
</scene> </scene>
<!--View Shippings--> <!--View Shippings-->
<scene sceneID="bVk-Ot-e4r"> <scene sceneID="bVk-Ot-e4r">
@ -1350,7 +1349,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="HiF-mN-Oyy" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="HiF-mN-Oyy" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="2627.1999999999998" y="2497.1514242878561"/> <point key="canvasLocation" x="4203.5199999999995" y="2246.3131252964226"/>
</scene> </scene>
<!--View Lineas Pedido--> <!--View Lineas Pedido-->
<scene sceneID="abp-9e-NQd"> <scene sceneID="abp-9e-NQd">
@ -1395,7 +1394,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="fUw-ce-BOb" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="fUw-ce-BOb" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="3604.8000000000002" y="2497.1514242878561"/> <point key="canvasLocation" x="5767.6800000000003" y="2246.3131252964226"/>
</scene> </scene>
<!--View Panel--> <!--View Panel-->
<scene sceneID="Arx-xc-GXd"> <scene sceneID="Arx-xc-GXd">
@ -1451,13 +1450,13 @@
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <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"> <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="70" y="22" width="216" height="15.5"/> <rect key="frame" x="59" y="22" width="227" height="15.5"/>
<fontDescription key="fontDescription" name="Raleway" family="Raleway" pointSize="18"/> <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"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Envios" translatesAutoresizingMaskIntoConstraints="NO" id="MDf-fZ-pqf"> <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="25" height="29.5"/> <rect key="frame" x="16" y="15" width="14" height="29.5"/>
</imageView> </imageView>
</subviews> </subviews>
<constraints> <constraints>
@ -1606,7 +1605,7 @@
<placeholder placeholderIdentifier="IBFirstResponder" id="UKE-4f-8cl" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="UKE-4f-8cl" userLabel="First Responder" sceneMemberID="firstResponder"/>
<exit id="30g-Dp-Trf" userLabel="Exit" sceneMemberID="exit"/> <exit id="30g-Dp-Trf" userLabel="Exit" sceneMemberID="exit"/>
</objects> </objects>
<point key="canvasLocation" x="1216" y="2497.1514242878561"/> <point key="canvasLocation" x="1945.5999999999999" y="2246.3131252964226"/>
</scene> </scene>
<!--View Search--> <!--View Search-->
<scene sceneID="O07-My-HzE"> <scene sceneID="O07-My-HzE">
@ -1659,7 +1658,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Awg-TA-uWn" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="Awg-TA-uWn" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="3457.5999999999999" y="1204.4977511244379"/> <point key="canvasLocation" x="5532.1599999999999" y="1083.5062229005439"/>
</scene> </scene>
<!--View Carrito--> <!--View Carrito-->
<scene sceneID="0LC-KJ-Uhr"> <scene sceneID="0LC-KJ-Uhr">
@ -1718,7 +1717,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="51I-ZI-cMo" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="51I-ZI-cMo" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="4195.1999999999998" y="517.24137931034488"/> <point key="canvasLocation" x="6712.3199999999997" y="465.28459907977054"/>
</scene> </scene>
<!--Dialog Validar Pedido--> <!--Dialog Validar Pedido-->
<scene sceneID="rmH-AM-ESK"> <scene sceneID="rmH-AM-ESK">
@ -1850,7 +1849,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="rZy-Fb-wEP" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="rZy-Fb-wEP" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="4870.3999999999996" y="517.24137931034488"/> <point key="canvasLocation" x="7792.6399999999994" y="465.28459907977054"/>
</scene> </scene>
<!--Title--> <!--Title-->
<scene sceneID="zJO-ca-Sc7"> <scene sceneID="zJO-ca-Sc7">
@ -1915,7 +1914,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="1DC-g6-IZP" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="1DC-g6-IZP" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="5568" y="517.24137931034488"/> <point key="canvasLocation" x="8908.7999999999993" y="465.28459907977054"/>
</scene> </scene>
<!--Dialog Finalizar Pedido--> <!--Dialog Finalizar Pedido-->
<scene sceneID="E0O-Qk-eqO"> <scene sceneID="E0O-Qk-eqO">
@ -1991,7 +1990,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="mv5-Ds-Pt5" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="mv5-Ds-Pt5" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="4345.6000000000004" y="1191.0044977511245"/> <point key="canvasLocation" x="6952.9600000000009" y="1071.3683637941151"/>
</scene> </scene>
<!--Tab View--> <!--Tab View-->
<scene sceneID="unH-YB-yAF"> <scene sceneID="unH-YB-yAF">
@ -2012,7 +2011,7 @@
</tabBarController> </tabBarController>
<placeholder placeholderIdentifier="IBFirstResponder" id="F7i-KH-npP" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="F7i-KH-npP" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="2561.5999999999999" y="517.24137931034488"/> <point key="canvasLocation" x="4099" y="383"/>
</scene> </scene>
<!--Navigation Controller--> <!--Navigation Controller-->
<scene sceneID="laE-xe-XNg"> <scene sceneID="laE-xe-XNg">
@ -2031,7 +2030,7 @@
</navigationController> </navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="w6h-bi-dO3" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="w6h-bi-dO3" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="2476.8000000000002" y="-825.78710644677665"/> <point key="canvasLocation" x="3962.8800000000001" y="-742.83697731344228"/>
</scene> </scene>
<!--Navigation Controller--> <!--Navigation Controller-->
<scene sceneID="thI-xY-Nta"> <scene sceneID="thI-xY-Nta">
@ -2053,7 +2052,7 @@
</navigationController> </navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Ne5-En-WA3" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="Ne5-En-WA3" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="3267.1999999999998" y="517.24137931034488"/> <point key="canvasLocation" x="5227.5199999999995" y="465.28459907977054"/>
</scene> </scene>
<!--Navigation Controller--> <!--Navigation Controller-->
<scene sceneID="mKA-sV-nhy"> <scene sceneID="mKA-sV-nhy">
@ -2073,7 +2072,7 @@
</navigationController> </navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="tev-g7-dQl" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="tev-g7-dQl" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="2588.8000000000002" y="1204.4977511244379"/> <point key="canvasLocation" x="4142.0799999999999" y="1083.5062229005439"/>
</scene> </scene>
<!--Navigation Controller--> <!--Navigation Controller-->
<scene sceneID="oyo-YX-drB"> <scene sceneID="oyo-YX-drB">
@ -2092,7 +2091,7 @@
</navigationController> </navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="b2h-Qz-BuL" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="b2h-Qz-BuL" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="1897.5999999999999" y="1782.008995502249"/> <point key="canvasLocation" x="3036.1599999999999" y="1603.0065926556963"/>
</scene> </scene>
<!--View Account--> <!--View Account-->
<scene sceneID="M8Q-BK-nWO"> <scene sceneID="M8Q-BK-nWO">
@ -2253,7 +2252,7 @@
</tableViewController> </tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="cPT-3i-KzE" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="cPT-3i-KzE" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="2588.8000000000002" y="1907.0464767616193"/> <point key="canvasLocation" x="4142.0799999999999" y="1715.4840870419364"/>
</scene> </scene>
<!--View Change Mail--> <!--View Change Mail-->
<scene sceneID="CXh-rX-sPS"> <scene sceneID="CXh-rX-sPS">
@ -2326,7 +2325,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="973-Ip-hRD" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="973-Ip-hRD" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="3352" y="1830.5847076461771"/> <point key="canvasLocation" x="5363.1999999999998" y="1646.70288543884"/>
</scene> </scene>
<!--View Change Password--> <!--View Change Password-->
<scene sceneID="qJO-VL-Qc2"> <scene sceneID="qJO-VL-Qc2">
@ -2415,7 +2414,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="EPq-IT-37Y" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="EPq-IT-37Y" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="3984" y="1817.9910044977512"/> <point key="canvasLocation" x="6374.3999999999996" y="1635.3742169395064"/>
</scene> </scene>
<!--Dialog Pagar Deuda--> <!--Dialog Pagar Deuda-->
<scene sceneID="6Qq-83-le3"> <scene sceneID="6Qq-83-le3">
@ -2537,7 +2536,7 @@
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Lyv-g7-z1n" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="Lyv-g7-z1n" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="2639.1999999999998" y="3147.9760119940033"/> <point key="canvasLocation" x="4222.7199999999993" y="2831.7625295298385"/>
</scene> </scene>
<!--Navigation Controller--> <!--Navigation Controller-->
<scene sceneID="2r3-3c-v5F"> <scene sceneID="2r3-3c-v5F">
@ -2555,26 +2554,26 @@
</navigationController> </navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="ZrF-4O-dOS" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="ZrF-4O-dOS" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="969.60000000000002" y="517.24137931034488"/> <point key="canvasLocation" x="1551.3600000000001" y="465.28459907977054"/>
</scene> </scene>
</scenes> </scenes>
<resources> <resources>
<image name="BackButton" width="22" height="22"/> <image name="BackButton" width="12.472440719604492" height="12.472440719604492"/>
<image name="Buscar" width="25" height="25"/> <image name="Buscar" width="14.17322826385498" height="14.17322826385498"/>
<image name="Buscar_fill" width="25" height="25"/> <image name="Buscar_fill" width="14.17322826385498" height="14.17322826385498"/>
<image name="Carrito" width="25" height="25"/> <image name="Carrito" width="14.17322826385498" height="14.17322826385498"/>
<image name="Carrito_fill" width="25" height="25"/> <image name="Carrito_fill" width="14.17322826385498" height="14.17322826385498"/>
<image name="Cuenta" width="25" height="25"/> <image name="Cuenta" width="14.17322826385498" height="14.17322826385498"/>
<image name="Cuenta_fill" width="25" height="25"/> <image name="Cuenta_fill" width="14.17322826385498" height="14.17322826385498"/>
<image name="Envios" width="25" height="25"/> <image name="Envios" width="14.17322826385498" height="14.17322826385498"/>
<image name="Home" width="25" height="25"/> <image name="Home" width="14.17322826385498" height="14.17322826385498"/>
<image name="Home_fill" width="25" height="25"/> <image name="Home_fill" width="14.17322826385498" height="14.17322826385498"/>
<image name="Login-01.jpg" width="1778" height="3156"/> <image name="Login-01.jpg" width="1778" height="3156"/>
<image name="Login.png" width="558" height="135"/> <image name="Login.png" width="558" height="135"/>
<image name="OcultarPrecios" width="25" height="25"/> <image name="OcultarPrecios" width="14.17322826385498" height="14.17322826385498"/>
<image name="Pagos" width="25" height="25"/> <image name="Pagos" width="14.17322826385498" height="14.17322826385498"/>
<image name="Salir" width="25" height="25"/> <image name="Salir" width="14.17322826385498" height="14.17322826385498"/>
<image name="Tick" width="25" height="25"/> <image name="Tick" width="14.17322826385498" height="14.17322826385498"/>
<image name="disclouser.png" width="66" height="66"/> <image name="disclouser.png" width="66" height="66"/>
</resources> </resources>
<inferredMetricsTieBreakers> <inferredMetricsTieBreakers>

View File

@ -17,7 +17,8 @@ class Colors: NSObject {
static let artificial: UInt = 0xff9800 static let artificial: UInt = 0xff9800
static let manufacturing: UInt = 0x795548 static let manufacturing: UInt = 0x795548
static let pets: UInt = 0x6b529c static let pets: UInt = 0x6b529c
static let handmade: UInt = 0x2f4bc2 static let handmade: UInt = 0x2f4bc2
static let fruta: UInt = 0xE35C2C
static let darkFlowers: UInt = 0x501212 static let darkFlowers: UInt = 0x501212
static let darkGreens: UInt = 0x827717 static let darkGreens: UInt = 0x827717
@ -27,12 +28,13 @@ class Colors: NSObject {
static let darkManufacturing: UInt = 0x3e2723 static let darkManufacturing: UInt = 0x3e2723
static let darkPets: UInt = 0x413063 static let darkPets: UInt = 0x413063
static let darkHandmade: UInt = 0x061f84 static let darkHandmade: UInt = 0x061f84
static let darkFruta: UInt = 0xA22A00
static let white: UInt = 0xFFFFFF static let white: UInt = 0xFFFFFF
static let verdnatura: UInt = 0xA8D52A 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,Values.HANDMADE: handmade] 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,Values.FRUTA: fruta]
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] 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,Values.FRUTA: darkFruta]
} }

View File

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

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB