diff --git a/.gradle/5.1.1/executionHistory/executionHistory.bin b/.gradle/5.1.1/executionHistory/executionHistory.bin
index 30f6732..3b42afe 100644
Binary files a/.gradle/5.1.1/executionHistory/executionHistory.bin and b/.gradle/5.1.1/executionHistory/executionHistory.bin differ
diff --git a/.gradle/5.1.1/executionHistory/executionHistory.lock b/.gradle/5.1.1/executionHistory/executionHistory.lock
index e794447..18058dd 100644
Binary files a/.gradle/5.1.1/executionHistory/executionHistory.lock and b/.gradle/5.1.1/executionHistory/executionHistory.lock differ
diff --git a/.gradle/5.1.1/fileHashes/fileHashes.bin b/.gradle/5.1.1/fileHashes/fileHashes.bin
index ba2dfda..692f706 100644
Binary files a/.gradle/5.1.1/fileHashes/fileHashes.bin and b/.gradle/5.1.1/fileHashes/fileHashes.bin differ
diff --git a/.gradle/5.1.1/fileHashes/fileHashes.lock b/.gradle/5.1.1/fileHashes/fileHashes.lock
index 7ee8267..7ae95c9 100644
Binary files a/.gradle/5.1.1/fileHashes/fileHashes.lock and b/.gradle/5.1.1/fileHashes/fileHashes.lock differ
diff --git a/.gradle/5.1.1/javaCompile/classAnalysis.bin b/.gradle/5.1.1/javaCompile/classAnalysis.bin
index 971b3f5..a89ca59 100644
Binary files a/.gradle/5.1.1/javaCompile/classAnalysis.bin and b/.gradle/5.1.1/javaCompile/classAnalysis.bin differ
diff --git a/.gradle/5.1.1/javaCompile/javaCompile.lock b/.gradle/5.1.1/javaCompile/javaCompile.lock
index 278def0..b0d4f01 100644
Binary files a/.gradle/5.1.1/javaCompile/javaCompile.lock and b/.gradle/5.1.1/javaCompile/javaCompile.lock differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 07f4d0d..4c84da5 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
index b127684..18d0090 100644
Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ebc9322..0de9ec0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -26,20 +26,14 @@
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
@@ -64,27 +58,38 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -106,7 +111,6 @@
saveLoadersWorkers
ink
Headless
- app.verd
getRoutes
checked = 0
txtIdRuta
@@ -115,6 +119,8 @@
app.verdnatura.es/bin/
result
saveLocal
+ listClientesTickets.add
+ app.verd
$PROJECT_DIR$
@@ -134,7 +140,6 @@
-
+
+
@@ -166,12 +173,13 @@
-
+
-
+
+
@@ -190,16 +198,29 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -217,7 +238,7 @@
-
+
@@ -341,7 +362,7 @@
-
+
@@ -356,13 +377,13 @@
-
-
+
+
-
+
@@ -378,6 +399,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -388,15 +444,9 @@
-
- file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java
- 186
-
-
-
file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java
- 602
+ 604
@@ -477,13 +527,6 @@
-
-
-
-
-
-
-
@@ -497,20 +540,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -529,20 +558,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -583,13 +598,6 @@
-
-
-
-
-
-
-
@@ -628,20 +636,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -649,61 +644,162 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/release/vn-delivery.apk b/app/release/vn-delivery.apk
index 78fead3..394cc4d 100644
Binary files a/app/release/vn-delivery.apk and b/app/release/vn-delivery.apk differ
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java b/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java
index 3d92db9..df443ce 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java
@@ -177,6 +177,7 @@ public class Tickets extends AppCompatActivity {
values.put("Id",cliente.getId());
values.put("Polizon",cliente.getPolizon());
c.addTicket(values);
+ c.setNote(c.getNote()+" - "+ cliente.getNote());
exists = true;
break;
}
@@ -190,6 +191,7 @@ public class Tickets extends AppCompatActivity {
values.put("Id",cliente.getId());
values.put("Polizon",cliente.getPolizon());
c.addTicket(values);
+ c.setNote(c.getNote()+" - "+ cliente.getNote());
exists = true;
break;
}
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java b/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java
index 864f679..d6454c6 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java
@@ -5,8 +5,8 @@ import verdnatura.es.repartoverdnatura.INTERFACES.RestClient;
public class ApiUtils {
private ApiUtils() {}
- //public static final String BASE_URL = "http://172.20.202.248:8080/";
- public static final String BASE_URL = "https://app.verdnatura.es/";
+ public static final String BASE_URL = "http://172.20.200.155:8080/";
+ //public static final String BASE_URL = "https://app.verdnatura.es/";
public static RestClient getAPIService() {
return RetrofitClient.getClient(BASE_URL).create(RestClient.class);
diff --git a/build/intermediates/lint-cache/maven.google/com/android/support/constraint/group-index.xml b/build/intermediates/lint-cache/maven.google/com/android/support/constraint/group-index.xml
index b2e8f03..d55ee8f 100644
--- a/build/intermediates/lint-cache/maven.google/com/android/support/constraint/group-index.xml
+++ b/build/intermediates/lint-cache/maven.google/com/android/support/constraint/group-index.xml
@@ -1,5 +1,5 @@
-
-
+
+
diff --git a/build/intermediates/lint-cache/maven.google/com/google/firebase/group-index.xml b/build/intermediates/lint-cache/maven.google/com/google/firebase/group-index.xml
index de4bc1c..0f93418 100644
--- a/build/intermediates/lint-cache/maven.google/com/google/firebase/group-index.xml
+++ b/build/intermediates/lint-cache/maven.google/com/google/firebase/group-index.xml
@@ -2,14 +2,14 @@
-
-
-
+
+
+
-
+
@@ -17,12 +17,12 @@
-
-
-
+
+
+
-
+
@@ -40,7 +40,7 @@
-
+
@@ -48,31 +48,33 @@
-
-
-
-
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+
+
diff --git a/build/intermediates/lint-cache/maven.google/master-index.xml b/build/intermediates/lint-cache/maven.google/master-index.xml
index 7e073d0..159db11 100644
--- a/build/intermediates/lint-cache/maven.google/master-index.xml
+++ b/build/intermediates/lint-cache/maven.google/master-index.xml
@@ -131,4 +131,9 @@
+
+
+
+
+