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

Implements tags in Products and some changes in UI

This commit is contained in:
quique 2018-06-12 11:45:28 +02:00
parent 796698a018
commit 5885c68bda
49 changed files with 1257 additions and 801 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
BaseLibrary
Verdnaturaventas/VerdnaturaventasTests
Verdnaturaventas/VerdnaturaventasuiTests

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

@ -7,7 +7,7 @@
<key>BaseLibrary.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
<integer>0</integer>
</dict>
</dict>
</dict>

64
BaseLibrary/BaseLibrary/Model/ModelBase.swift
View File

@ -22,8 +22,8 @@ open class ModelBase: NSObject {
}
func generateDictionary() -> Dictionary<String,String>{
var dictionary = Dictionary<String, String>()
@ -50,37 +50,37 @@ open class ModelBase: NSObject {
if(v != nil){
var val = toString(value!)
switch(type){
case "String":
setValue(val, forKey: property)
break
case "String":
setValue(val, forKey: property)
break
case "String, String":
val = val.replacingOccurrences(of: "{\n", with: "")
val = val.replacingOccurrences(of: "\n}", with: "")
val = val.replacingOccurrences(of: " ", with: "")
let array = val.components(separatedBy: ";\n")
var dictionary: Dictionary<String, String> = Dictionary()
case "String, String":
val = val.replacingOccurrences(of: "{\n", with: "")
val = val.replacingOccurrences(of: "\n}", with: "")
val = val.replacingOccurrences(of: " ", with: "")
let array = val.components(separatedBy: ";\n")
var dictionary: Dictionary<String, String> = Dictionary()
if property != "tags"{
for a in array{
let data = a.components(separatedBy: " = ")
dictionary[data[0].replacingOccurrences(of: ";", with: "")] = data[1].replacingOccurrences(of: ";", with: "")
}
print(dictionary)
break
}
break
case "NSNumber":
let nVal = Double(val)!
if(nVal.truncatingRemainder(dividingBy: 1) == 0)
{
setValue(NSNumber(value: Int(nVal) as Int), forKey: property)
}
else{
setValue(NSNumber(value: nVal as Double), forKey: property)
}
break
case "NSNumber":
let nVal = Double(val)!
if(nVal.truncatingRemainder(dividingBy: 1) == 0)
{
setValue(NSNumber(value: Int(nVal) as Int), forKey: property)
}
else{
setValue(NSNumber(value: nVal as Double), forKey: property)
}
break
default:
break
default:
break
}
}
}
@ -99,12 +99,12 @@ open class ModelBase: NSObject {
func toBool(_ value: String) -> Bool? {
switch (value){
case "True", "true", "yes", "1":
return true
case "False", "false", "no", "0":
return false
default:
return nil
case "True", "true", "yes", "1":
return true
case "False", "false", "no", "0":
return false
default:
return nil
}
}
}

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

@ -225,6 +225,10 @@
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 */; };
EBF69B4A20CE82490015D1D8 /* Roboto-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EBF69B4920CE82440015D1D8 /* Roboto-Light.ttf */; };
EBF69B4C20CE82530015D1D8 /* Roboto-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EBF69B4B20CE824F0015D1D8 /* Roboto-Bold.ttf */; };
EBF69B4E20CE82620015D1D8 /* Roboto-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EBF69B4D20CE825D0015D1D8 /* Roboto-Regular.ttf */; };
EBF69B5020CEA57A0015D1D8 /* CeldaTagDetails.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBF69B4F20CEA57A0015D1D8 /* CeldaTagDetails.swift */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -514,6 +518,10 @@
A6F581571C6B6AF50003D27F /* DatosCompra.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DatosCompra.swift; path = Model/DatosCompra.swift; sourceTree = "<group>"; };
A6F581591C6B76BA0003D27F /* CmdCrearOrder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CmdCrearOrder.swift; path = Command/CmdCrearOrder.swift; sourceTree = "<group>"; };
D88084E26A228A358E419BD7 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
EBF69B4920CE82440015D1D8 /* Roboto-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Light.ttf"; sourceTree = "<group>"; };
EBF69B4B20CE824F0015D1D8 /* Roboto-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Bold.ttf"; sourceTree = "<group>"; };
EBF69B4D20CE825D0015D1D8 /* Roboto-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Regular.ttf"; sourceTree = "<group>"; };
EBF69B4F20CEA57A0015D1D8 /* CeldaTagDetails.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CeldaTagDetails.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -859,6 +867,7 @@
A64EC3B11E8D36AE00B7166A /* CeldaTicketRecibido.swift */,
A642113F1F2F562700DFBE10 /* CeldaArticuloTags.xib */,
A630B94E1F30B1960029BF52 /* CeldaArticuloTags.swift */,
EBF69B4F20CEA57A0015D1D8 /* CeldaTagDetails.swift */,
);
name = Celdas;
sourceTree = "<group>";
@ -923,6 +932,7 @@
A6BABF821C33F8A00082BADE /* Verdnaturaventas */ = {
isa = PBXGroup;
children = (
EBF69B4720CE82320015D1D8 /* fonts */,
A677BF781C61F0F400100429 /* Pruebas.playground */,
A6BABF8F1C33F8A00082BADE /* Info.plist */,
A65F5E6F1C47BDF2004FEAE1 /* LaunchScreen.storyboard */,
@ -1021,6 +1031,16 @@
name = Pods;
sourceTree = "<group>";
};
EBF69B4720CE82320015D1D8 /* fonts */ = {
isa = PBXGroup;
children = (
EBF69B4D20CE825D0015D1D8 /* Roboto-Regular.ttf */,
EBF69B4920CE82440015D1D8 /* Roboto-Light.ttf */,
EBF69B4B20CE824F0015D1D8 /* Roboto-Bold.ttf */,
);
name = fonts;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@ -1233,6 +1253,7 @@
A60340201C3FE07100BDF2ED /* Login.png in Resources */,
A6AB5A2A1C4F9461004F068F /* flor.png in Resources */,
A6366C7B1C90507000EF8470 /* OFL.txt in Resources */,
EBF69B4C20CE82530015D1D8 /* Roboto-Bold.ttf in Resources */,
A6B0285E1C578F4700D679EF /* CeldaDobleString.xib in Resources */,
A63D76B11C563D93009C2A16 /* disclouser.png in Resources */,
A63FB0931C5B9D0300C42AF4 /* CeldaArticulo.xib in Resources */,
@ -1240,8 +1261,10 @@
A649B9C31C96E68400024538 /* Localizable.strings in Resources */,
A69984241C686F3F002E8CCC /* CeldaCarrito.xib in Resources */,
A64211401F2F562700DFBE10 /* CeldaArticuloTags.xib in Resources */,
EBF69B4A20CE82490015D1D8 /* Roboto-Light.ttf in Resources */,
A6E3A4C51C7495F7009CE806 /* CeldaPrecioRecalculado.xib in Resources */,
A676F1451C91802C00C0D751 /* buscar_fill25.png in Resources */,
EBF69B4E20CE82620015D1D8 /* Roboto-Regular.ttf in Resources */,
A6366C7F1C90507000EF8470 /* Raleway-Heavy.ttf in Resources */,
A676F12E1C917D1000C0D751 /* envios50.png in Resources */,
A67B6DCA1C902D3000F03F3F /* inicio75.png in Resources */,
@ -1364,6 +1387,7 @@
A6957DF81C8457DB000A2219 /* ViewAccount.swift in Sources */,
A66EDF201C8970B6008EF663 /* TicketRecepcionLinea.swift in Sources */,
A6F581581C6B6AF50003D27F /* DatosCompra.swift in Sources */,
EBF69B5020CEA57A0015D1D8 /* CeldaTagDetails.swift in Sources */,
A68095F41C7C67B800F3283C /* DialogValidarPedido.swift in Sources */,
A69CEDCC1C3A82D700482F9B /* SecurityFacade.swift in Sources */,
A69935EB1C51130400A94281 /* ViewListadoPedidosPendientes.swift in Sources */,

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

@ -7,7 +7,7 @@
<key>Verdnaturaventas.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
<integer>1</integer>
</dict>
</dict>
</dict>

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

Binary file not shown.

21
Verdnaturaventas/Verdnaturaventas/Assets.xcassets/Address.imageset/Contents.json vendored Normal file
View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "facebook-placeholder-for-locate-places-on-maps.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Verdnaturaventas/Verdnaturaventas/Assets.xcassets/Address.imageset/facebook-placeholder-for-locate-places-on-maps.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

21
Verdnaturaventas/Verdnaturaventas/Assets.xcassets/Agency.imageset/Contents.json vendored Normal file
View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "truck-icon (1).png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Verdnaturaventas/Verdnaturaventas/Assets.xcassets/Agency.imageset/truck-icon (1).png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

5
Verdnaturaventas/Verdnaturaventas/Assets.xcassets/AppIcon.appiconset/Contents.json
View File

@ -97,6 +97,11 @@
"idiom" : "ipad",
"filename" : "Icon-83.5@2x.png",
"scale" : "2x"
},
{
"idiom" : "ios-marketing",
"size" : "1024x1024",
"scale" : "1x"
}
],
"info" : {

21
Verdnaturaventas/Verdnaturaventas/Assets.xcassets/Client.imageset/Contents.json vendored Normal file
View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "user-silhouette (1).png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Verdnaturaventas/Verdnaturaventas/Assets.xcassets/Client.imageset/user-silhouette (1).png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 759 B

21
Verdnaturaventas/Verdnaturaventas/Assets.xcassets/Date.imageset/Contents.json vendored Normal file
View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "calendar (1).png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Verdnaturaventas/Verdnaturaventas/Assets.xcassets/Date.imageset/calendar (1).png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 998 B

21
Verdnaturaventas/Verdnaturaventas/Assets.xcassets/Next.imageset/Contents.json vendored Normal file
View File

@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "next.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Verdnaturaventas/Verdnaturaventas/Assets.xcassets/Next.imageset/next.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 412 B

27
Verdnaturaventas/Verdnaturaventas/CeldaTagDetails.swift Normal file
View File

@ -0,0 +1,27 @@
//
// CeldaTagDetails.swift
// Verdnaturaventas
//
// Created by Enrique Blasco Blanquer on 11/6/18.
// Copyright © 2018 Nelo Sanchez Gomiz. All rights reserved.
//
import UIKit
class CeldaTagDetails: UITableViewCell {
@IBOutlet weak var txtTitle: UILabel!
override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}

30
Verdnaturaventas/Verdnaturaventas/Celdas/CeldaArticulo.xib
View File

@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="Alignment constraints to the first baseline" minToolsVersion="6.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="Raleway-Bold.ttf">
<string>Raleway-Bold</string>
<array key="Roboto-Bold.ttf">
<string>Roboto-Bold</string>
</array>
<array key="Raleway-Medium.ttf">
<string>Raleway-Medium</string>
<array key="Roboto-Regular.ttf">
<string>Roboto-Regular</string>
</array>
</customFonts>
<objects>
@ -38,34 +38,34 @@
<constraints>
<constraint firstAttribute="height" constant="24" id="CCs-Ih-wY9"/>
</constraints>
<fontDescription key="fontDescription" name="Raleway-Bold" family="Raleway" pointSize="15"/>
<fontDescription key="fontDescription" name="Roboto-Bold" family="Roboto" pointSize="15"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="m7W-jD-Web">
<rect key="frame" x="8" y="35" width="176" height="24"/>
<rect key="frame" x="8" y="35" width="179" height="24"/>
<constraints>
<constraint firstAttribute="height" constant="24" id="ZpX-Ir-bUF"/>
</constraints>
<fontDescription key="fontDescription" name="Raleway-Medium" family="Raleway" pointSize="15"/>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="15"/>
<color key="textColor" red="0.1215686275" green="0.12941176469999999" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="B9c-c5-Cv7">
<rect key="frame" x="8" y="61" width="175" height="24"/>
<fontDescription key="fontDescription" name="Raleway-Medium" family="Raleway" pointSize="15"/>
<rect key="frame" x="8" y="61" width="178" height="24"/>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="15"/>
<color key="textColor" red="0.1215686275" green="0.12941176469999999" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="NJS-cI-EGs">
<rect key="frame" x="191" y="61" width="41" height="30"/>
<fontDescription key="fontDescription" name="Raleway-Bold" family="Raleway" pointSize="15"/>
<rect key="frame" x="194" y="61" width="38" height="30"/>
<fontDescription key="fontDescription" name="Roboto-Bold" family="Roboto" pointSize="15"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="sD2-4E-nzK">
<rect key="frame" x="191" y="38" width="40" height="18"/>
<fontDescription key="fontDescription" name="Raleway-Medium" family="Raleway" pointSize="15"/>
<rect key="frame" x="194" y="38" width="37" height="18"/>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="15"/>
<color key="textColor" red="0.1215686275" green="0.12941176469999999" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>

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

@ -15,7 +15,14 @@ class CeldaArticuloTags: UITableViewCell {
@IBOutlet weak var lablDesde: UILabel!
@IBOutlet weak var lablArticulo: UILabel!
@IBOutlet weak var lablPrecio: UILabel!
// @IBOutlet weak var viewTags: ViewTags!
@IBOutlet weak var valCat1: UILabel!
@IBOutlet weak var valCat2: UILabel!
@IBOutlet weak var valCat3: UILabel!
@IBOutlet weak var valCat4: UILabel!
@IBOutlet weak var valCat5: UILabel!
@IBOutlet weak var valCat6: UILabel!
// @IBOutlet weak var viewTags: ViewTags!
func pintarCelda(_ articulo: ArticuloVentasTags)
@ -26,7 +33,12 @@ class CeldaArticuloTags: UITableViewCell {
lablArticulo.text = articulo.Article
if(ControllerPreferences.mostrarPrecios())
{
lablDesde.text = NSLocalizedString("desde", comment: "")
let valueRange = ("\(String(describing: articulo.available!)) \(NSLocalizedString("desde", comment: ""))" as NSString).range(of: "\(String(describing: articulo.available!))")
let attributedString = NSMutableAttributedString(string: "\(String(describing: articulo.available!)) \(NSLocalizedString("desde", comment: ""))", attributes: [NSFontAttributeName : UIFont.systemFont(ofSize: 15)])
attributedString.setAttributes([NSFontAttributeName : UIFont.boldSystemFont(ofSize: 19)], range: valueRange)
lablDesde.text = "\(String(describing: articulo.available!)) \(NSLocalizedString("desde", comment: ""))"
lablDesde.attributedText = attributedString
lablPrecio.text = "\(UtilsNumbers.roundDouble(NSNumber(value: articulo.price!.doubleValue), decimals: 2))€"
}
else
@ -35,8 +47,55 @@ class CeldaArticuloTags: UITableViewCell {
lablPrecio.text = " "
}
//viewTags.setTags(tags: articulo.tags)
//print tags for article v1.0.5
clearLabels()
printTags(articulo.tags)
}
private func printTags(_ tags: Dictionary<String, String>){
var index = 1
var valueRange:NSRange?
var attributedString:NSMutableAttributedString?
for tag in tags{
valueRange = ("\(tag.key): \(tag.value)" as NSString).range(of: tag.value)
attributedString = NSMutableAttributedString(string: "\(tag.key): \(tag.value)", attributes: [NSFontAttributeName : UIFont.systemFont(ofSize: 15)])
attributedString?.setAttributes([NSForegroundColorAttributeName : UIColor.darkGray], range: valueRange!)
switch index{
case 1: valCat1.text = "\(tag.key): \(tag.value)"
valCat1.attributedText = attributedString
break
case 2:valCat2.text = "\(tag.key): \(tag.value)"
valCat2.attributedText = attributedString
break
case 3:valCat3.text = "\(tag.key): \(tag.value)"
valCat3.attributedText = attributedString
break
case 4:valCat4.text = "\(tag.key): \(tag.value)"
valCat4.attributedText = attributedString
break
case 5:valCat5.text = "\(tag.key): \(tag.value)"
valCat5.attributedText = attributedString
break
case 6:valCat6.text = "\(tag.key): \(tag.value)"
valCat6.attributedText = attributedString
break
default:
break
}
index += 1
}
}
private func clearLabels(){
valCat1.text = ""
valCat2.text = ""
valCat3.text = ""
valCat4.text = ""
valCat5.text = ""
valCat6.text = ""
}
}

195
Verdnaturaventas/Verdnaturaventas/Celdas/CeldaArticuloTags.xib
View File

@ -1,98 +1,163 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<device id="retina3_5" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="Raleway-Bold.ttf">
<string>Raleway-Bold</string>
<array key="Roboto-Bold.ttf">
<string>Roboto-Bold</string>
</array>
<array key="Raleway-Medium.ttf">
<string>Raleway-Medium</string>
<array key="Roboto-Regular.ttf">
<string>Roboto-Regular</string>
</array>
</customFonts>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="CeldaArticuloTags" selectionStyle="default" indentationWidth="10" reuseIdentifier="CeldaArticuloTags" rowHeight="196" id="R5P-us-21s" customClass="CeldaArticuloTags" customModule="Verdnaturaventas" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="450" height="196"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="CeldaArticuloTags" selectionStyle="default" indentationWidth="10" reuseIdentifier="CeldaArticuloTags" rowHeight="205" id="R5P-us-21s" customClass="CeldaArticuloTags" customModule="Verdnaturaventas" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="319" height="205"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="R5P-us-21s" id="x48-aX-llT">
<rect key="frame" x="0.0" y="0.0" width="450" height="195.5"/>
<rect key="frame" x="0.0" y="0.0" width="319" height="204.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7L8-4q-jJB" customClass="UIImageViewAsyncVentas" customModule="Verdnaturaventas" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="199" height="196"/>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7L8-4q-jJB" customClass="UIImageViewAsyncVentas" customModule="Verdnaturaventas" customModuleProvider="target">
<rect key="frame" x="3" y="0.0" width="87" height="205"/>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wrW-B5-u5a">
<rect key="frame" x="207" y="0.0" width="243" height="196"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2ka-Xu-yF2" customClass="UITableView">
<rect key="frame" x="0.0" y="47" width="235" height="97"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="97" id="dZa-Az-84a"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="J9A-dz-85N">
<rect key="frame" x="0.0" y="152" width="175" height="35"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<fontDescription key="fontDescription" name="Raleway-Medium" family="Raleway" pointSize="15"/>
<color key="textColor" red="0.1215686275" green="0.12941176469999999" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Ixn-Jk-vKQ">
<rect key="frame" x="183" y="152" width="52" height="36"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<fontDescription key="fontDescription" name="Raleway-Bold" family="Raleway" pointSize="15"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="RY3-6S-SOU">
<rect key="frame" x="0.0" y="4" width="235" height="35"/>
<constraints>
<constraint firstAttribute="height" constant="35" id="dP4-eP-Vvn"/>
</constraints>
<fontDescription key="fontDescription" name="Raleway-Bold" family="Raleway" pointSize="15"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Tarrina Ceramica BLN" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MoR-hq-YiM">
<rect key="frame" x="104" y="8" width="207" height="28"/>
<constraints>
<constraint firstItem="RY3-6S-SOU" firstAttribute="top" secondItem="wrW-B5-u5a" secondAttribute="top" constant="4" id="5e7-Bx-CGG"/>
<constraint firstItem="2ka-Xu-yF2" firstAttribute="leading" secondItem="wrW-B5-u5a" secondAttribute="leading" id="L7Z-1V-dCW"/>
<constraint firstAttribute="trailing" secondItem="2ka-Xu-yF2" secondAttribute="trailing" constant="8" id="aDR-n7-zYw"/>
<constraint firstAttribute="trailing" secondItem="RY3-6S-SOU" secondAttribute="trailing" constant="8" id="cEI-gc-hnY"/>
<constraint firstItem="RY3-6S-SOU" firstAttribute="leading" secondItem="wrW-B5-u5a" secondAttribute="leading" id="gL6-z3-X72"/>
<constraint firstAttribute="width" secondItem="wrW-B5-u5a" secondAttribute="height" multiplier="243:196" id="hiw-wu-8Hz"/>
<constraint firstItem="2ka-Xu-yF2" firstAttribute="top" secondItem="RY3-6S-SOU" secondAttribute="bottom" constant="8" id="z5K-Vr-VMy"/>
<constraint firstAttribute="width" constant="207" id="vTV-J8-9ot"/>
<constraint firstAttribute="height" constant="28" id="ys2-QR-EG5"/>
</constraints>
</view>
<fontDescription key="fontDescription" name="Roboto-Bold" family="Roboto" pointSize="15"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dZw-MX-kLG">
<rect key="frame" x="104" y="36" width="207" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="6KG-XE-Waj"/>
</constraints>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="15"/>
<color key="textColor" red="0.52242296929999998" green="0.51895540949999996" blue="0.52248382569999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1ZB-8e-s0d">
<rect key="frame" x="104" y="56" width="207" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="ibx-pe-SHv"/>
</constraints>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="15"/>
<color key="textColor" red="0.52242296929999998" green="0.51895540949999996" blue="0.52248382569999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zbb-nT-DUL">
<rect key="frame" x="104" y="75" width="207" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="k26-3A-oLa"/>
</constraints>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="15"/>
<color key="textColor" red="0.52242296929999998" green="0.51895540949999996" blue="0.52248382569999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P3Y-PL-cGv">
<rect key="frame" x="104" y="94" width="207" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="jOc-Bu-5fL"/>
</constraints>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="15"/>
<color key="textColor" red="0.52242296929999998" green="0.51895540949999996" blue="0.52248382569999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Hz-ss-bkc">
<rect key="frame" x="104" y="113" width="207" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="8vZ-l1-FgY"/>
</constraints>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="15"/>
<color key="textColor" red="0.52242296929999998" green="0.51895540949999996" blue="0.52248382569999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rrw-i4-0z4">
<rect key="frame" x="104" y="132" width="207" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="CYa-ag-GcZ"/>
</constraints>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="15"/>
<color key="textColor" red="0.52242296934127808" green="0.51895540952682495" blue="0.52248382568359375" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="EUR 1693,99" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z95-TD-I9F">
<rect key="frame" x="191" y="173" width="120" height="24"/>
<constraints>
<constraint firstAttribute="height" constant="24" id="T5R-TN-Fph"/>
</constraints>
<fontDescription key="fontDescription" name="Roboto-Bold" family="Roboto" pointSize="19"/>
<color key="textColor" red="0.69118046760559082" green="0.18406125903129578" blue="0.15759018063545227" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="29680 from" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E9r-J7-eZ7">
<rect key="frame" x="104" y="173" width="90" height="24"/>
<constraints>
<constraint firstAttribute="width" constant="90" id="5yf-yM-rE5"/>
<constraint firstAttribute="height" constant="24" id="JWG-f0-A8m"/>
</constraints>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="14"/>
<color key="textColor" red="0.52242296929999998" green="0.51895540949999996" blue="0.52248382569999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="wrW-B5-u5a" firstAttribute="top" secondItem="x48-aX-llT" secondAttribute="top" id="1Yw-Wy-3Q8"/>
<constraint firstItem="7L8-4q-jJB" firstAttribute="top" secondItem="x48-aX-llT" secondAttribute="top" id="3Fw-Mm-4wR"/>
<constraint firstItem="7L8-4q-jJB" firstAttribute="leading" secondItem="x48-aX-llT" secondAttribute="leading" id="4ag-f7-JAU"/>
<constraint firstAttribute="trailing" secondItem="wrW-B5-u5a" secondAttribute="trailing" id="9mo-q3-F9e"/>
<constraint firstAttribute="bottom" secondItem="7L8-4q-jJB" secondAttribute="bottom" constant="-0.5" id="BdD-B2-jm1"/>
<constraint firstAttribute="bottom" secondItem="wrW-B5-u5a" secondAttribute="bottom" constant="-0.5" id="d1f-W3-w6g"/>
<constraint firstItem="wrW-B5-u5a" firstAttribute="leading" secondItem="7L8-4q-jJB" secondAttribute="trailing" constant="8" id="vQR-J6-cPQ"/>
<constraint firstItem="dZw-MX-kLG" firstAttribute="leading" secondItem="7L8-4q-jJB" secondAttribute="trailing" constant="14" id="1od-SC-rGj"/>
<constraint firstItem="5Hz-ss-bkc" firstAttribute="top" secondItem="Zbb-nT-DUL" secondAttribute="bottom" constant="17" id="4FS-A5-mSg"/>
<constraint firstItem="1ZB-8e-s0d" firstAttribute="leading" secondItem="7L8-4q-jJB" secondAttribute="trailing" constant="14" id="9EI-wz-dyY"/>
<constraint firstItem="P3Y-PL-cGv" firstAttribute="top" secondItem="1ZB-8e-s0d" secondAttribute="bottom" constant="17" id="AMn-dA-BEw"/>
<constraint firstAttribute="trailing" secondItem="Z95-TD-I9F" secondAttribute="trailing" constant="8" id="HRW-YF-tOr"/>
<constraint firstAttribute="trailing" secondItem="P3Y-PL-cGv" secondAttribute="trailing" constant="8" id="IWw-5c-cpk"/>
<constraint firstItem="7L8-4q-jJB" firstAttribute="leading" secondItem="x48-aX-llT" secondAttribute="leading" constant="3" id="JQx-2B-obN"/>
<constraint firstAttribute="trailing" secondItem="5Hz-ss-bkc" secondAttribute="trailing" constant="8" id="Jbh-fv-OBW"/>
<constraint firstAttribute="trailing" secondItem="Zbb-nT-DUL" secondAttribute="trailing" constant="8" id="L6x-SM-UDt"/>
<constraint firstItem="Zbb-nT-DUL" firstAttribute="leading" secondItem="7L8-4q-jJB" secondAttribute="trailing" constant="14" id="LfS-eV-sfI"/>
<constraint firstItem="MoR-hq-YiM" firstAttribute="leading" secondItem="7L8-4q-jJB" secondAttribute="trailing" constant="14" id="M2n-Ba-1kT"/>
<constraint firstAttribute="bottom" secondItem="7L8-4q-jJB" secondAttribute="bottom" id="MEc-Jt-p0k"/>
<constraint firstItem="rrw-i4-0z4" firstAttribute="leading" secondItem="7L8-4q-jJB" secondAttribute="trailing" constant="14" id="Mwt-iy-jhZ"/>
<constraint firstItem="5Hz-ss-bkc" firstAttribute="leading" secondItem="7L8-4q-jJB" secondAttribute="trailing" constant="14" id="NHl-Qq-bfg"/>
<constraint firstAttribute="trailing" secondItem="1ZB-8e-s0d" secondAttribute="trailing" constant="8" id="Rh3-eR-epF"/>
<constraint firstItem="dZw-MX-kLG" firstAttribute="top" secondItem="MoR-hq-YiM" secondAttribute="bottom" id="VwZ-sp-Nen"/>
<constraint firstItem="1ZB-8e-s0d" firstAttribute="top" secondItem="dZw-MX-kLG" secondAttribute="bottom" id="Xk7-hI-Myh"/>
<constraint firstAttribute="trailing" secondItem="rrw-i4-0z4" secondAttribute="trailing" constant="8" id="YXG-te-sHo"/>
<constraint firstItem="E9r-J7-eZ7" firstAttribute="leading" secondItem="7L8-4q-jJB" secondAttribute="trailing" constant="14" id="ZDJ-hy-OCE"/>
<constraint firstAttribute="trailing" secondItem="MoR-hq-YiM" secondAttribute="trailing" constant="8" id="dyw-IC-VkW"/>
<constraint firstItem="MoR-hq-YiM" firstAttribute="top" secondItem="x48-aX-llT" secondAttribute="top" constant="8" id="iRP-72-jIi"/>
<constraint firstItem="Z95-TD-I9F" firstAttribute="leading" secondItem="7L8-4q-jJB" secondAttribute="trailing" constant="101" id="kj8-dR-8E1"/>
<constraint firstItem="7L8-4q-jJB" firstAttribute="top" secondItem="x48-aX-llT" secondAttribute="top" id="lta-ox-gMu"/>
<constraint firstAttribute="bottom" secondItem="Z95-TD-I9F" secondAttribute="bottom" constant="7.5" id="mD4-Wb-XPX"/>
<constraint firstItem="P3Y-PL-cGv" firstAttribute="leading" secondItem="7L8-4q-jJB" secondAttribute="trailing" constant="14" id="pP7-SQ-Ya2"/>
<constraint firstItem="rrw-i4-0z4" firstAttribute="top" secondItem="P3Y-PL-cGv" secondAttribute="bottom" constant="17" id="sjV-vV-4vw"/>
<constraint firstAttribute="trailing" secondItem="dZw-MX-kLG" secondAttribute="trailing" constant="8" id="swN-RQ-UTY"/>
<constraint firstItem="Zbb-nT-DUL" firstAttribute="top" secondItem="dZw-MX-kLG" secondAttribute="bottom" constant="19" id="wHp-Aj-aKC"/>
<constraint firstAttribute="bottom" secondItem="E9r-J7-eZ7" secondAttribute="bottom" constant="7.5" id="zl6-4K-S4M"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="imagenArticulo" destination="7L8-4q-jJB" id="oG8-EJ-Aw6"/>
<outlet property="lablArticulo" destination="RY3-6S-SOU" id="Xfc-l8-haP"/>
<outlet property="lablDesde" destination="J9A-dz-85N" id="tlL-BP-FBL"/>
<outlet property="lablPrecio" destination="Ixn-Jk-vKQ" id="dtG-RD-GeF"/>
<outlet property="lablArticulo" destination="MoR-hq-YiM" id="j3h-sP-bZG"/>
<outlet property="lablDesde" destination="E9r-J7-eZ7" id="Gp2-TC-Lu5"/>
<outlet property="lablPrecio" destination="Z95-TD-I9F" id="eZb-eg-CLr"/>
<outlet property="valCat1" destination="dZw-MX-kLG" id="DJH-cQ-IPv"/>
<outlet property="valCat2" destination="1ZB-8e-s0d" id="gVl-0Y-1lW"/>
<outlet property="valCat3" destination="Zbb-nT-DUL" id="Ct4-J8-DqB"/>
<outlet property="valCat4" destination="P3Y-PL-cGv" id="BjR-pd-fjU"/>
<outlet property="valCat5" destination="5Hz-ss-bkc" id="hXU-9Z-4ug"/>
<outlet property="valCat6" destination="rrw-i4-0z4" id="O87-0g-KpX"/>
</connections>
<point key="canvasLocation" x="60" y="24"/>
<point key="canvasLocation" x="454.5" y="47.5"/>
</tableViewCell>
</objects>
</document>

1
Verdnaturaventas/Verdnaturaventas/Celdas/CeldaBoton.swift
View File

@ -11,6 +11,7 @@ import UIKit
class CeldaBoton: UICollectionViewCell {
@IBOutlet weak var boton: UIImageView!
@IBOutlet weak var title: UILabel!
func pintarCelda(_ b: String)
{

29
Verdnaturaventas/Verdnaturaventas/Celdas/CeldaBoton.xib
View File

@ -1,9 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="Roboto-Regular.ttf">
<string>Roboto-Regular</string>
</array>
</customFonts>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
@ -20,18 +29,30 @@
<userDefinedRuntimeAttribute type="string" keyPath="layer.cornerRadius" value="10"/>
</userDefinedRuntimeAttributes>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="flowers" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="K5E-fH-AFc">
<rect key="frame" x="20" y="170" width="260" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="PQC-9I-e4z"/>
</constraints>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="14"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<constraints>
<constraint firstAttribute="bottom" secondItem="7UT-iQ-4wD" secondAttribute="bottom" constant="8" id="2WH-va-GeJ"/>
<constraint firstAttribute="trailing" secondItem="K5E-fH-AFc" secondAttribute="trailing" constant="20" id="55D-ob-jGs"/>
<constraint firstItem="7UT-iQ-4wD" firstAttribute="top" secondItem="SyG-1K-yFy" secondAttribute="top" constant="8" id="HvM-mi-Bxt"/>
<constraint firstItem="K5E-fH-AFc" firstAttribute="leading" secondItem="SyG-1K-yFy" secondAttribute="leading" constant="20" id="PY2-KP-2dZ"/>
<constraint firstAttribute="bottom" secondItem="K5E-fH-AFc" secondAttribute="bottom" constant="9" id="QDJ-pa-yJR"/>
<constraint firstItem="7UT-iQ-4wD" firstAttribute="leading" secondItem="SyG-1K-yFy" secondAttribute="leading" constant="8" id="gUJ-PQ-vnr"/>
<constraint firstAttribute="trailing" secondItem="7UT-iQ-4wD" secondAttribute="trailing" constant="8" id="pW2-Zl-mfE"/>
</constraints>
<size key="customSize" width="300" height="200"/>
<connections>
<outlet property="boton" destination="7UT-iQ-4wD" id="xge-q4-2H1"/>
<outlet property="title" destination="K5E-fH-AFc" id="H12-HC-1Ej"/>
</connections>
<point key="canvasLocation" x="426" y="526"/>
</collectionViewCell>

42
Verdnaturaventas/Verdnaturaventas/Celdas/CeldaCarrito.xib
View File

@ -1,17 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="Alignment constraints to the first baseline" minToolsVersion="6.0"/>
<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">
<mutableArray key="Raleway-Regular.ttf">
<string>Raleway</string>
<string>Raleway</string>
<string>Raleway</string>
</mutableArray>
<array key="Roboto-Regular.ttf">
<string>Roboto-Regular</string>
</array>
</customFonts>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@ -20,34 +22,34 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="58"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="wUp-xw-arn" id="wbL-Ia-Kdh">
<rect key="frame" x="0.0" y="0.0" width="287" height="57"/>
<rect key="frame" x="0.0" y="0.0" width="286" height="57.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="YRs-XA-DKI" customClass="UIImageViewAsync" customModule="BaseLibrary">
<rect key="frame" x="8" y="4" width="50" height="50"/>
<rect key="frame" x="16" y="7" width="50" height="45"/>
<constraints>
<constraint firstAttribute="width" constant="50" id="CEf-1I-nfe"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fq6-IJ-PdQ">
<rect key="frame" x="66" y="28" width="166" height="21"/>
<fontDescription key="fontDescription" name="Raleway" family="Raleway" pointSize="15"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<rect key="frame" x="74" y="31" width="166" height="16"/>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="15"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1vL-4O-nI7">
<rect key="frame" x="66" y="8" width="166" height="21"/>
<rect key="frame" x="74" y="11" width="166" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="166" id="DrQ-vF-g1K"/>
</constraints>
<fontDescription key="fontDescription" name="Raleway" family="Raleway" pointSize="15"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="15"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oUS-1I-7il">
<rect key="frame" x="240" y="8" width="47" height="41"/>
<fontDescription key="fontDescription" name="Raleway" family="Raleway" pointSize="15"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<rect key="frame" x="248" y="11" width="38" height="36"/>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="15"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
@ -68,7 +70,7 @@
<constraint firstItem="fq6-IJ-PdQ" firstAttribute="baseline" secondItem="oUS-1I-7il" secondAttribute="baseline" id="zN5-YM-cgg"/>
</constraints>
</tableViewCellContentView>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
<outlet property="imageArticle" destination="YRs-XA-DKI" id="NFd-6V-fxP"/>
<outlet property="labelSubtitle" destination="fq6-IJ-PdQ" id="2US-tW-crY"/>

18
Verdnaturaventas/Verdnaturaventas/Celdas/CeldaDobleString.xib
View File

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<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">
<array key="Raleway-Regular.ttf">
<string>Raleway</string>
<array key="Roboto-Regular.ttf">
<string>Roboto-Regular</string>
</array>
</customFonts>
<objects>
@ -21,20 +21,20 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="65"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="mUw-Wx-OrN" id="hlN-Vv-xDl">
<rect key="frame" x="0.0" y="0.0" width="287" height="64"/>
<rect key="frame" x="0.0" y="0.0" width="286" height="64.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="SRF-wj-EWl">
<rect key="frame" x="8" y="8" width="275" height="18"/>
<rect key="frame" x="16" y="11" width="266" height="18"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" name="Raleway" family="Raleway" pointSize="15"/>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="15"/>
<color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="LId-n2-4Jb">
<rect key="frame" x="8" y="34" width="275" height="24"/>
<rect key="frame" x="16" y="37" width="266" height="19"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" name="Raleway" family="Raleway" pointSize="19"/>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="19"/>
<color key="textColor" red="0.20000000300000001" green="0.20000000300000001" blue="0.20000000300000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>

16
Verdnaturaventas/Verdnaturaventas/Celdas/CeldaImageTitle.xib
View File

@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<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">
<array key="Raleway-Regular.ttf">
<string>Raleway</string>
<array key="Roboto-Regular.ttf">
<string>Roboto-Regular</string>
</array>
</customFonts>
<objects>
@ -22,18 +22,18 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="69"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9KA-0m-dMy" id="2Qo-zT-hgM">
<rect key="frame" x="0.0" y="0.0" width="287" height="68"/>
<rect key="frame" x="0.0" y="0.0" width="286" height="68.5"/>
<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="onL-eQ-Rwj">
<rect key="frame" x="85" y="0.0" width="235" height="68"/>
<rect key="frame" x="88" y="3" width="231" height="63"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" name="Raleway" family="Raleway" pointSize="17"/>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="17"/>
<color key="textColor" red="0.20000000300000001" green="0.20000000300000001" blue="0.20000000300000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="wqe-uV-bR4" customClass="UIImageViewAsync" customModule="BaseLibrary">
<rect key="frame" x="8" y="6" width="55" height="55"/>
<rect key="frame" x="16" y="9" width="50" height="50"/>
<constraints>
<constraint firstAttribute="width" secondItem="wqe-uV-bR4" secondAttribute="height" multiplier="1:1" id="Vob-W3-iby"/>
</constraints>

16
Verdnaturaventas/Verdnaturaventas/Celdas/CeldaLineasRecibidas.xib
View File

@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<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">
<array key="Raleway-Regular.ttf">
<string>Raleway</string>
<array key="Roboto-Regular.ttf">
<string>Roboto-Regular</string>
</array>
</customFonts>
<objects>
@ -22,18 +22,18 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="69"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tbG-Ev-aOl" id="qPN-Qo-IqN">
<rect key="frame" x="0.0" y="0.0" width="320" height="68"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="68.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j1C-1c-ycu">
<rect key="frame" x="71" y="8" width="241" height="23"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Raleway" family="Raleway" pointSize="17"/>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="17"/>
<color key="textColor" red="0.20000000300000001" green="0.20000000300000001" blue="0.20000000300000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ucu-mE-NDr" customClass="UIImageViewAsync" customModule="BaseLibrary">
<rect key="frame" x="8" y="6" width="55" height="55"/>
<rect key="frame" x="16" y="9" width="50" height="50"/>
<constraints>
<constraint firstAttribute="width" secondItem="ucu-mE-NDr" secondAttribute="height" multiplier="1:1" id="F3G-JQ-m8O"/>
</constraints>
@ -41,7 +41,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cBF-RC-Uaa">
<rect key="frame" x="71" y="37" width="241" height="23"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Raleway" family="Raleway" pointSize="17"/>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="17"/>
<color key="textColor" red="0.20000000300000001" green="0.20000000300000001" blue="0.20000000300000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>

31
Verdnaturaventas/Verdnaturaventas/Celdas/CeldaPrecioRecalculado.xib
View File

@ -1,15 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<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">
<mutableArray key="Raleway-Regular.ttf">
<string>Raleway</string>
<string>Raleway</string>
</mutableArray>
<array key="Roboto-Regular.ttf">
<string>Roboto-Regular</string>
</array>
</customFonts>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@ -18,22 +21,22 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="67"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="MjU-ky-DAn" id="SyY-GB-gKm">
<rect key="frame" x="0.0" y="0.0" width="320" height="66"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="66.5"/>
<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="wEL-CP-h5Q">
<rect key="frame" x="8" y="8" width="304" height="21"/>
<fontDescription key="fontDescription" name="Raleway" family="Raleway" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<rect key="frame" x="16" y="11" width="288" height="16"/>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sIa-mC-68S">
<rect key="frame" x="8" y="37" width="304" height="21"/>
<rect key="frame" x="16" y="35" width="288" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="X0Q-Cf-u9s"/>
</constraints>
<fontDescription key="fontDescription" name="Raleway" family="Raleway" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>

30
Verdnaturaventas/Verdnaturaventas/Celdas/CeldaPrecios.xib
View File

@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<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">
<array key="Raleway-Regular.ttf">
<string>Raleway</string>
<array key="Roboto-Bold.ttf">
<string>Roboto-Bold</string>
</array>
<array key="Raleway-SemiBold.ttf">
<string>Raleway-SemiBold</string>
<array key="Roboto-Regular.ttf">
<string>Roboto-Regular</string>
</array>
</customFonts>
<objects>
@ -24,36 +24,36 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="71"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3cR-EP-2bh" id="c7G-r8-RdK">
<rect key="frame" x="0.0" y="0.0" width="320" height="70"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="70.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nOb-Vj-qrZ">
<rect key="frame" x="179" y="8" width="133" height="34"/>
<fontDescription key="fontDescription" name="Raleway-SemiBold" family="Raleway" pointSize="20"/>
<rect key="frame" x="179" y="11" width="125" height="29"/>
<fontDescription key="fontDescription" name="Roboto-Bold" family="Roboto" pointSize="20"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9qI-WX-MTG">
<rect key="frame" x="8" y="42" width="304" height="21"/>
<rect key="frame" x="16" y="40" width="288" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="ULa-yL-865"/>
</constraints>
<fontDescription key="fontDescription" name="Raleway" family="Raleway" pointSize="15"/>
<fontDescription key="fontDescription" name="Roboto-Bold" family="Roboto" pointSize="15"/>
<color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="txw-fD-hjV">
<rect key="frame" x="8" y="8" width="133" height="34"/>
<fontDescription key="fontDescription" name="Raleway" family="Raleway" pointSize="20"/>
<rect key="frame" x="16" y="11" width="125" height="29"/>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="20"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="X" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GNf-cp-XJG">
<rect key="frame" x="149" y="8" width="22" height="34"/>
<rect key="frame" x="149" y="11" width="22" height="29"/>
<constraints>
<constraint firstAttribute="width" constant="22" id="9H5-DE-Gec"/>
</constraints>
<fontDescription key="fontDescription" name="Raleway" family="Raleway" pointSize="17"/>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>

26
Verdnaturaventas/Verdnaturaventas/Celdas/CeldaString.xib
View File

@ -1,14 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<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">
<mutableArray key="Raleway-Regular.ttf">
<string>Raleway</string>
</mutableArray>
<array key="Roboto-Regular.ttf">
<string>Roboto-Regular</string>
</array>
</customFonts>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@ -17,13 +21,13 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="sAK-7a-DPV" id="T1d-V0-TZN">
<rect key="frame" x="0.0" y="0.0" width="320" height="59"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="59.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iIA-OA-TxO">
<rect key="frame" x="15" y="12" width="305" height="35"/>
<fontDescription key="fontDescription" name="Raleway" family="Raleway" pointSize="18"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<rect key="frame" x="23" y="15" width="297" height="29"/>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="18"/>
<color key="textColor" red="0.3333333432674408" green="0.3333333432674408" blue="0.3333333432674408" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
@ -34,7 +38,7 @@
<constraint firstAttribute="trailing" secondItem="iIA-OA-TxO" secondAttribute="trailing" id="w4R-Xv-deQ"/>
</constraints>
</tableViewCellContentView>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
<outlet property="texto" destination="iIA-OA-TxO" id="JES-0d-inh"/>
</connections>

22
Verdnaturaventas/Verdnaturaventas/Celdas/CeldaTicketRecibido.xib
View File

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="Raleway-Regular.ttf">
<string>Raleway</string>
<array key="Roboto-Regular.ttf">
<string>Roboto-Regular</string>
</array>
</customFonts>
<objects>
@ -21,37 +21,37 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="65"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="FIs-n1-koj" id="klY-BV-uJM">
<rect key="frame" x="0.0" y="0.0" width="287" height="64.5"/>
<rect key="frame" x="0.0" y="0.0" width="286" height="64.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="ecd-mW-kLt">
<rect key="frame" x="8" y="8" width="279" height="23"/>
<rect key="frame" x="8" y="8" width="278" height="23"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" secondItem="ecd-mW-kLt" secondAttribute="height" multiplier="279:23" id="UOA-nD-o1c"/>
<constraint firstAttribute="width" secondItem="ecd-mW-kLt" secondAttribute="height" multiplier="279:23" id="aLy-qq-GNW"/>
</constraints>
<fontDescription key="fontDescription" name="Raleway" family="Raleway" pointSize="19"/>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="19"/>
<color key="textColor" red="0.1215686275" green="0.12941176469999999" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalCompressionResistancePriority="749" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Hoj-Fm-ted">
<rect key="frame" x="8" y="39" width="149" height="20"/>
<rect key="frame" x="8" y="39" width="150" height="20"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" secondItem="Hoj-Fm-ted" secondAttribute="height" multiplier="149:20" id="Pqg-Oj-Owc"/>
</constraints>
<fontDescription key="fontDescription" name="Raleway" family="Raleway" pointSize="15"/>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="15"/>
<color key="textColor" red="0.66562587019999997" green="0.66614204649999997" blue="0.66570580010000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalCompressionResistancePriority="749" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Nxf-n1-RlY">
<rect key="frame" x="165" y="39" width="122" height="20"/>
<rect key="frame" x="163" y="39" width="123" height="20"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="width" secondItem="Nxf-n1-RlY" secondAttribute="height" multiplier="61:10" id="Wbj-aL-B4T"/>
</constraints>
<fontDescription key="fontDescription" name="Raleway" family="Raleway" pointSize="15"/>
<fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="15"/>
<color key="textColor" red="0.66562587019999997" green="0.66614204649999997" blue="0.66570580010000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>

33
Verdnaturaventas/Verdnaturaventas/Dialog/DialogPrecios.swift
View File

@ -13,6 +13,7 @@ class DialogPrecios: MyViewVentas, UITableViewDelegate, UITableViewDataSource {
@IBOutlet weak var tablaPrecios: UITableView!
@IBOutlet weak var progressBar: UIActivityIndicatorView!
@IBOutlet weak var btnBack: UIButton!
var ejecutando = false
var articulo: ArticuloVentasTags?
@ -28,8 +29,12 @@ class DialogPrecios: MyViewVentas, UITableViewDelegate, UITableViewDataSource {
tablaPrecios.rowHeight = 71
tablaPrecios.backgroundColor = UIColor.groupTableViewBackground
tablaPrecios.tableFooterView = UIView()
btnBack.setTitle(NSLocalizedString("cancelar", comment: ""), for: UIControlState())
}
@IBAction func cancel(_ sender: Any) {
self.navigationController?.popViewController(animated: true)
}
@IBAction func clickTrash(_ sender: AnyObject) {
if(!ejecutando)
@ -40,7 +45,7 @@ class DialogPrecios: MyViewVentas, UITableViewDelegate, UITableViewDataSource {
tablaPrecios.reloadData()
}
}
}
@ -102,27 +107,27 @@ class DialogPrecios: MyViewVentas, UITableViewDelegate, UITableViewDataSource {
let alert = AlertStock(v: self)
alert.showDialog()
}
}
}
func mostrarValores(_ dato: DatosCompra)
{
var cantidad = 0
for d in datosSalvados {
if(dato.tarifa == d.tarifa) {
dato.Especificaciones = String(format: NSLocalizedString("dialog_comprar_bought", comment: ""), arguments: [d.Cantidad!.intValue])
}
cantidad += (d.Cantidad?.intValue)!
}
}
func addDatoCompra(_ dato: DatosCompra)
{
var existe = false
for d in datosSalvados {
if dato.tarifa == d.tarifa {
let cantidad = (dato.Cantidad?.intValue)! + (d.Cantidad?.intValue)!
@ -131,13 +136,13 @@ class DialogPrecios: MyViewVentas, UITableViewDelegate, UITableViewDataSource {
break
}
}
if(!existe)
{
let da = ControllerPedido.generateDato(dato, t: nil, a: nil)
datosSalvados.append(da)
}
}
func getCantidadTotal() -> Int
@ -146,7 +151,7 @@ class DialogPrecios: MyViewVentas, UITableViewDelegate, UITableViewDataSource {
for d in datosSalvados {
cantidad += (d.Cantidad?.intValue)!
}
return cantidad
}
@ -156,7 +161,7 @@ class DialogPrecios: MyViewVentas, UITableViewDelegate, UITableViewDataSource {
singleTap.numberOfTapsRequired = 1
image.isUserInteractionEnabled = true
image.addGestureRecognizer(singleTap)
}
func AgregarLinea()
@ -171,22 +176,22 @@ class DialogPrecios: MyViewVentas, UITableViewDelegate, UITableViewDataSource {
handlerFinish: {
self.aplication.pedido = cmd.order
_ = self.navigationController?.popViewController(animated: true)
},
},
handlerRetry: {
for d in self.datosSalvados
{
ControllerPedido.borrarCompra(d)
self.AgregarLinea()
}
},
},
handlerAccept: {
for d in self.datosSalvados
{
ControllerPedido.borrarCompra(d)
}
self.prepareOrder(false)
}
}
)
execute(cmd);
}

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

@ -26,7 +26,7 @@ class Commands: NSObject {
static let obtener_stock_tags = "obtener_stock_tags"
static let obtener_articulo_ventas = "obtener_articulo_ventas"
static let obtener_articulo_ventas = "obtener_articulo_ventas_tags"
static let recalcular_precios = "recalcular_precios"

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

@ -24,7 +24,7 @@ class FacadeVentasClient: FacadeClient, URLSessionDelegate {
let url = HOST+facade+"/"+command
let req = NSMutableURLRequest(url: URL(string: url)!)
print(ControllerPreferences.recuperarUsuario())
req.httpMethod = POST
req.timeoutInterval = 10
req.setValue(String(argsMessage!.characters.count), forHTTPHeaderField: "Content-Length")

9
Verdnaturaventas/Verdnaturaventas/Info.plist
View File

@ -24,11 +24,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.4</string>
<string>1.1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>6</string>
<string>7</string>
<key>LSApplicationCategoryType</key>
<string></string>
<key>LSRequiresIPhoneOS</key>
@ -41,6 +41,9 @@
<key>UIAppFonts</key>
<array>
<string>Raleway</string>
<string>Roboto-Regular.ttf</string>
<string>Roboto-Light.ttf</string>
<string>Roboto-Bold.ttf</string>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
@ -61,6 +64,8 @@
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>CFBundleGetInfoString</key>
<string></string>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
</dict>

1097
Verdnaturaventas/Verdnaturaventas/Main.storyboard
View File

File diff suppressed because it is too large Load Diff

8
Verdnaturaventas/Verdnaturaventas/Parser/ParserArticulo.swift
View File

@ -40,7 +40,13 @@ class ParserArticulo: Parser {
articulo.parseJson(jsonDictionary)
articulo.tarifas = ParserTarifa().parse(jsonDictionary["tarifas"] as! NSArray)
//articulo.tags = jsonDictionary["tags"] as! Dictionary
if jsonDictionary["tags"] != nil && jsonDictionary["tags"] is Dictionary<String, Any>{
articulo.tags = jsonDictionary["tags"] as! Dictionary
}
return articulo

BIN
Verdnaturaventas/Verdnaturaventas/Roboto-Bold.ttf Executable file
View File

Binary file not shown.

BIN
Verdnaturaventas/Verdnaturaventas/Roboto-Light.ttf Executable file
View File

Binary file not shown.

BIN
Verdnaturaventas/Verdnaturaventas/Roboto-Regular.ttf Executable file
View File

Binary file not shown.

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.

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

@ -14,6 +14,7 @@ class ViewArticulos: MyViewVentas, UITableViewDelegate, UITableViewDataSource {
@IBOutlet weak var progressBar: UIActivityIndicatorView!
@IBOutlet weak var tableArticulos: UITableView!
@IBOutlet weak var txtResultados: UILabel!
var tipo = 0
var cadena = ""
@ -27,7 +28,7 @@ class ViewArticulos: MyViewVentas, UITableViewDelegate, UITableViewDataSource {
progress = progressBar
self.title = tipoNombre
tableArticulos.backgroundColor = UIColor.groupTableViewBackground
tableArticulos.rowHeight = 196
}
override func viewWillAppear(_ animated: Bool) {
@ -49,6 +50,7 @@ class ViewArticulos: MyViewVentas, UITableViewDelegate, UITableViewDataSource {
self.articulos = cmd.articulos!
self.inicializado = true
self.tableArticulos.reloadData()
self.txtResultados.text = "\(self.articulos.count) \(NSLocalizedString("resultados", comment: ""))"
self.showProgress(false)
},
handlerRetry: {
@ -58,10 +60,12 @@ class ViewArticulos: MyViewVentas, UITableViewDelegate, UITableViewDataSource {
handlerAccept: {
self.inicializado = true
self.tableArticulos.reloadData()
self.txtResultados.text = "\(self.articulos.count) \(NSLocalizedString("resultados", comment: ""))"
self.showProgress(false)
}
)
execute(cmd)
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
@ -94,6 +98,10 @@ class ViewArticulos: MyViewVentas, UITableViewDelegate, UITableViewDataSource {
launchSegue("segueDetalleArticulo", sender: indexPath.row as AnyObject?)
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return CGFloat(68 + (articulos[indexPath.row].tags.count * 21))
}
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
if(segue.identifier == "segueDetalleArticulo")

4
Verdnaturaventas/Verdnaturaventas/Views/ViewCarrito.swift
View File

@ -120,4 +120,8 @@ class ViewCarrito: MyViewVentas, UITableViewDelegate, UITableViewDataSource {
}
@IBAction func clickPendingOrder(sender: AnyObject) {
launchSegue("seguePedidosPendientes")
}
}

80
Verdnaturaventas/Verdnaturaventas/Views/ViewDetalleArticulo.swift
View File

@ -9,37 +9,31 @@
import UIKit
import BaseLibrary
class ViewDetalleArticulo: MyViewVentas {
class ViewDetalleArticulo: MyViewVentas, UITableViewDelegate, UITableViewDataSource {
@IBOutlet weak var imageArticulo: UIImageViewAsyncVentas!
@IBOutlet weak var progressBar: UIActivityIndicatorView!
@IBOutlet weak var labelNombre: UILabel!
@IBOutlet weak var labelProductor: UILabel!
@IBOutlet weak var labelColor: UILabel!
@IBOutlet weak var labelMedida: UILabel!
@IBOutlet weak var labelDisponible: UILabel!
@IBOutlet weak var valueColor: UILabel!
@IBOutlet weak var valueMedida: UILabel!
@IBOutlet weak var valueDisponibler: UILabel!
@IBOutlet weak var labelDesde: UILabel!
@IBOutlet weak var valuePrice: UILabel!
@IBOutlet weak var buttonComprar: UIButton!
@IBOutlet weak var scrollView: UIScrollView!
@IBOutlet weak var tableView: UITableView!
@IBOutlet weak var heightConstTable: NSLayoutConstraint!
var articulo: ArticuloVentasTags?
//var titlesDatos = []
//var dataDatos = []
override func createView() {
scrollView.isScrollEnabled = true
self.tableView.delegate = self
self.tableView.dataSource = self
heightConstTable.constant = CGFloat((self.articulo?.tags.count)! * 33)
imageArticulo.clipsToBounds = true
progress = progressBar
contenedor = scrollView
valueColor.textColor = UtilsIos.getColor(Colors.colors[(articulo?.Reino?.intValue)!]!)
valueMedida.textColor = UtilsIos.getColor(Colors.colors[(articulo?.Reino?.intValue)!]!)
valueDisponibler.textColor = UtilsIos.getColor(Colors.colors[(articulo?.Reino?.intValue)!]!)
buttonComprar.backgroundColor = UtilsIos.getColor(Colors.colors[(articulo?.Reino?.intValue)!]!)
buttonComprar.setTitle(NSLocalizedString("fragment_articulo_comprar", comment: ""), for: UIControlState())
self.navigationController?.navigationBar.barTintColor = UtilsIos.getColor(Colors.colors[(articulo?.Reino!.intValue)!]!, alpha: 0.0)
@ -67,18 +61,21 @@ class ViewDetalleArticulo: MyViewVentas {
cmd.callbacks = CommandCallbacks(
handlerStart: {},
handlerFinish: {
//cmd.articulo?.tags = (self.articulo?.tags)!
self.articulo = cmd.articulo
self.setValues()
self.showProgress(false)
self.inicializado = true
},
self.tableView.reloadData()
self.heightConstTable.constant = CGFloat((self.articulo?.tags.count)! * 33)
},
handlerRetry: {
self.showProgress(false)
self.getArticulo()
},
},
handlerAccept: {
_ = self.navigationController?.popToRootViewController(animated: true)
}
}
)
@ -96,18 +93,19 @@ class ViewDetalleArticulo: MyViewVentas {
}
}
func setValues()
{
imageArticulo.downloadImage(String(format: "%@%@", Values.BASE_URL_LARGE, self.articulo!.foto!))
labelNombre.text = articulo?.Article
labelColor.text = NSLocalizedString("color", comment: "").uppercased()
labelDisponible.text = NSLocalizedString("disp", comment: "").uppercased()
labelMedida.text = NSLocalizedString("medida", comment: "").uppercased()
valueDisponibler.text = "\(articulo!.available!)"
if(ControllerPreferences.mostrarPrecios())
{
labelDesde.text = NSLocalizedString("desde", comment: "")
let valueRange = ("\(self.articulo!.available!) \(NSLocalizedString("desde", comment: ""))" as NSString).range(of: "\(String(describing: self.articulo!.available!))")
let attributedString = NSMutableAttributedString(string: "\(self.articulo!.available!) \(NSLocalizedString("desde", comment: ""))", attributes: [NSFontAttributeName : UIFont.systemFont(ofSize: 15)])
attributedString.setAttributes([NSFontAttributeName : UIFont.boldSystemFont(ofSize: 25)], range: valueRange)
labelDesde.text = "\(self.articulo!.available!) \(NSLocalizedString("desde", comment: ""))"
labelDesde.attributedText = attributedString
valuePrice.text = "\(ControllerArticulo.getMinPrice(articulo!))€"
}
else
@ -117,6 +115,32 @@ class ViewDetalleArticulo: MyViewVentas {
}
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return (self.articulo?.tags.count)!
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = self.tableView.dequeueReusableCell(withIdentifier: "catcell", for: indexPath) as! CeldaTagDetails
let valueRange = ("\(Array(self.articulo!.tags.keys)[indexPath.row]) \(Array(self.articulo!.tags.values)[indexPath.row])" as NSString).range(of: Array(self.articulo!.tags.values)[indexPath.row])
let attributedString = NSMutableAttributedString(string: "\(Array(self.articulo!.tags.keys)[indexPath.row]) \(Array(self.articulo!.tags.values)[indexPath.row])", attributes: [NSFontAttributeName : UIFont.systemFont(ofSize: 17)])
attributedString.setAttributes([NSForegroundColorAttributeName : UIColor.darkGray], range: valueRange)
cell.txtTitle.text = "\(Array(self.articulo!.tags.keys)[indexPath.row]) \(Array(self.articulo!.tags.values)[indexPath.row])"
cell.txtTitle.attributedText = attributedString
return cell
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return 33.0
}
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
if(segue.identifier == "seguePrecios")
{

10
Verdnaturaventas/Verdnaturaventas/Views/ViewImage.swift
View File

@ -9,9 +9,10 @@
import Foundation
import BaseLibrary
class ViewImage: MyViewVentas{
class ViewImage: MyViewVentas, UIScrollViewDelegate {
@IBOutlet weak var scrollView: UIScrollView!
@IBOutlet weak var imageFoto: UIImageViewAsyncVentas!
var foto = ""
@ -20,9 +21,14 @@ class ViewImage: MyViewVentas{
super.viewWillAppear(animated)
let url = String(format: "%@%@", Values.BASE_URL_FULL, foto)
imageFoto.downloadImage(url)
scrollView.minimumZoomScale = 1.0
scrollView.maximumZoomScale = 6.0
rewriteBackButton()
}
func viewForZooming(in scrollView: UIScrollView) -> UIView? {
return imageFoto
}
override func goBack() {
self.navigationController?.popViewController(animated: true)
}

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

@ -17,20 +17,18 @@ class ViewMain: MyViewVentas, UICollectionViewDelegate, UICollectionViewDataSour
@IBOutlet weak var lablStreet: UILabel!
@IBOutlet weak var lablDate: UILabel!
@IBOutlet weak var lablAgency: UILabel!
@IBOutlet weak var btnPendientes: UIBarButtonItem!
@IBOutlet weak var titleClient: UILabel!
@IBOutlet weak var titleStreet: UILabel!
@IBOutlet weak var titleConsignatorio: UILabel!
@IBOutlet weak var titleDate: UILabel!
@IBOutlet weak var titleAgency: UILabel!
@IBOutlet weak var titlePending: UILabel!
let titles = [NSLocalizedString("main_flowers", comment: ""),
NSLocalizedString("main_greens", comment: ""),
NSLocalizedString("main_plants", comment: ""),
NSLocalizedString("main_artificial", comment: ""),
NSLocalizedString("main_supplements", comment: ""),
NSLocalizedString("main_manufacturing", comment: "")]
NSLocalizedString("main_greens", comment: ""),
NSLocalizedString("main_plants", comment: ""),
NSLocalizedString("main_artificial", comment: ""),
NSLocalizedString("main_supplements", comment: ""),
NSLocalizedString("main_manufacturing", comment: "")]
let images = ["flor.png", "verde.png", "planta.png", "artificial.png", "complemento.png", "confeccion.png"]
@ -42,6 +40,11 @@ class ViewMain: MyViewVentas, UICollectionViewDelegate, UICollectionViewDataSour
self.tabBarController?.tabBar.tintColor = UtilsIos.getColor(0x3e3e3f)
self.tabBarController?.tabBar.clipsToBounds = true
self.navigationController!.viewControllers = [self]
self.btnPendientes.title = NSLocalizedString("fragment_pedidos_pendientes", comment: "")
self.titleClient.text = NSLocalizedString("fragment_configurar_pedido_cliente", comment: "").uppercased()
self.titleConsignatorio.text = NSLocalizedString("main_delivery_address", comment: "").uppercased()
self.titleDate.text = NSLocalizedString("main_arraival", comment: "").uppercased()
self.titleAgency.text = NSLocalizedString("main_agency", comment: "").uppercased()
}
override func viewWillAppear(_ animated: Bool) {
@ -63,16 +66,14 @@ class ViewMain: MyViewVentas, UICollectionViewDelegate, UICollectionViewDataSour
}
self.lablClient.text = aplication.pedido!.cliente!.Cliente
self.lablStreet.text = aplication.pedido!.consignatarioActivo!.Domicilio
if (aplication.pedido?.agencia != nil){
self.lablAgency.textColor = UIColor.darkGray
}
}
override func setTitles() {
titleClient.text = NSLocalizedString("fragment_configurar_pedido_cliente", comment: "").uppercased()
titleStreet.text = NSLocalizedString("main_delivery_address", comment: "").uppercased()
titleDate.text = NSLocalizedString("main_arraival", comment: "").uppercased()
titleAgency.text = NSLocalizedString("main_agency", comment: "").uppercased()
titlePending.text = NSLocalizedString("fragment_pedidos_pendientes", comment: "").uppercased()
self.title = NSLocalizedString("order", comment: "")
}
@ -88,6 +89,7 @@ class ViewMain: MyViewVentas, UICollectionViewDelegate, UICollectionViewDataSour
internal func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "CeldaBoton", for: indexPath as IndexPath) as! CeldaBoton
cell.pintarCelda(images[indexPath.row])
cell.title.text = titles[indexPath.row]
return cell
}
@ -100,10 +102,10 @@ class ViewMain: MyViewVentas, UICollectionViewDelegate, UICollectionViewDataSour
else{
let alert = AlertAgency(v: self)
alert.showDialog()
lablAgency.textColor = UIColor.red
}
}
}
@ -115,8 +117,12 @@ class ViewMain: MyViewVentas, UICollectionViewDelegate, UICollectionViewDataSour
return CGSize(width: collectionViewWidth, height: collectionViewWidth)
}
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets {
return UIEdgeInsetsMake(0, 0, 0, 0)
}
@IBAction func clickOrder(sender: UITapGestureRecognizer) {
if((aplication.pedido?.rows?.count)! > 0){
@ -129,17 +135,21 @@ class ViewMain: MyViewVentas, UICollectionViewDelegate, UICollectionViewDataSour
}
@IBAction func clickPendingOrder(sender: AnyObject) {
@IBAction func clickPending(_ sender: Any) {
launchSegue("seguePedidosPendientes")
}
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
if (segue.identifier! == "segueFamilias") {
let viewFamilias = segue.destination as! ViewFamilias
let parametros = sender as! ParametrosReino
viewFamilias.parametros = parametros
}else if (segue.identifier! == "goclientes"){
let view = segue.destination as! ViewSearch
view.tipo = view.TIPO_CLIENTES
}
}
}