Se agrega el hvd_usuario

B4A/B4XMainPage.bas

@@ -214,6 +214,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	Subs.agregaColumna("CAT_GUNAPROD","PRECIOCONVER","TEXT")
 	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS RUTAA (RUTAA TEXT)")
 	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS wayPoints (codigo TEXT, indice INT)")
+	Subs.agregaColumna("HIST_VENTAS","HVD_USUARIO","TEXT")
 	Dim server As String = "http://keymon.net:1781"
 '	Dim server As String = "http://192.168.100.10:1781"
 '	Dim server As String = "http://keymon.lat:9000"

B4A/C_Principal.bas

@@ -1510,19 +1510,20 @@ Sub JobDone(Job As HttpJob)
 					Dim cantc As String = records(result.Columns.Get("HVD_CANTC"))
 					Dim HVD_RUTA As String = records(result.Columns.Get("HVD_RUTA"))
 					Dim HVD_LISTAPRECIO As String = records(result.Columns.Get("HVD_LISTAPRECIO"))
+					Dim HVD_USUARIO As String = records(result.Columns.Get("HVD_USUARIO"))
 '					Dim HVD_LISTAPRECIO As String = 1
 '					Log("  ++  insert into HIST_VENTAS: "&HVD_CLIENTE&","&HVD_PRONOMBRE&","&HVD_CANT)
 					consecutivo = consecutivo +1
 					If l_ruta.Text = "0" Then 'Si no hay ruta cargada, guardamos todos los clientes
 '						Log("No hay ruta, guardamos todos")
-						Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS(HVD_CLIENTE, HVD_PRONOMBRE, HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL, PLACA,BCAJAS,CANTC,CONSECUTIVO,BCAJAS_OR,CANTC_OR, HVD_RUTA, HVD_LISTAPRECIO) VALUES (?,?,?,?,?,?,?,?,?,?,0,0,?,?,?,?,?,?, ?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_PLACA,bcajas,cantc,consecutivo,bcajas,cantc, HVD_RUTA,HVD_LISTAPRECIO))
+						Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS(HVD_CLIENTE, HVD_PRONOMBRE, HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL, PLACA,BCAJAS,CANTC,CONSECUTIVO,BCAJAS_OR,CANTC_OR, HVD_RUTA, HVD_LISTAPRECIO,HVD_USUARIO) VALUES (?,?,?,?,?,?,?,?,?,?,0,0,?,?,?,?,?,?, ?,?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_PLACA,bcajas,cantc,consecutivo,bcajas,cantc, HVD_RUTA,HVD_LISTAPRECIO,HVD_USUARIO))
 						Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS2(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL) VALUES (?,?,?,?,?,?,?,?,?,?,0,0)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO))
 					Else 'Si ya hay ruta cargada, solo guardamos los clientes nuevos.
 '						Log("Hay ruta, guardamos los nuevos")
-						Private tc As Cursor = Starter.skmt.ExecQuery($"select HVD_CLIENTE from HIST_VENTAS where HVD_CLIENTE = '${HVD_CLIENTE}' and HVD_PROID = '${HVD_PROID}'"$)
+						Private tc As Cursor = Starter.skmt.ExecQuery($"select HVD_CLIENTE from HIST_VENTAS where HVD_CLIENTE = '${HVD_CLIENTE}' and HVD_PROID = '${HVD_PROID}' AND HVD_CANT = '${HVD_CANT}' AND HVD_CODPROMO = '${HVD_CODPROMO}' AND HVD_USUARIO='${HVD_USUARIO}' "$)
 						If tc.RowCount = 0 Then
 '							Log($"Guardamos ${HVD_CLIENTE}"$)
-							Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL, PLACA,BCAJAS,CANTC,CONSECUTIVO,BCAJAS_OR,CANTC_OR, HVD_RUTA, HVD_LISTAPRECIO) VALUES (?,?,?,?,?,?,?,?,?,?,0,0,?,?,?,?,?,?, ?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_PLACA,bcajas,cantc,consecutivo,bcajas,cantc, HVD_RUTA,HVD_LISTAPRECIO))
+							Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL, PLACA,BCAJAS,CANTC,CONSECUTIVO,BCAJAS_OR,CANTC_OR, HVD_RUTA, HVD_LISTAPRECIO,HVD_USUARIO) VALUES (?,?,?,?,?,?,?,?,?,?,0,0,?,?,?,?,?,?, ?,?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_PLACA,bcajas,cantc,consecutivo,bcajas,cantc, HVD_RUTA,HVD_LISTAPRECIO,HVD_USUARIO))
 							Starter.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS2(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO, HVD_ESTATUS, HVD_PARCIAL) VALUES (?,?,?,?,?,?,?,?,?,?,0,0)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_CODPROMO, HVD_PROID,HVD_NUM_TICKET, HVD_NUM_REGISTRO, HVD_RECHAZO))
 						End If
 					End If

B4A/C_Productos.bas

@@ -96,7 +96,8 @@ Sub B4XPage_Appear
 '	c=Starter.skmt.ExecQuery("select distinct hist_ventas.hvd_num_registro, HIST_VENTAS.HVD_CLIENTE, HIST_VENTAS.HVD_PRONOMBRE, HIST_VENTAS.HVD_PROID, HIST_VENTAS.HVD_CANT, HIST_VENTAS2.HVD_CANT as HVD_CANT2, HIST_VENTAS.HVD_COSTO_TOT, HIST_VENTAS.HVD_CODPROMO from HIST_VENTAS inner join HIST_VENTAS2 on HIST_VENTAS.HVD_PROID = HIST_VENTAS2.HVD_PROID and HIST_VENTAS.HVD_CLIENTE = HIST_VENTAS2.HVD_CLIENTE WHERE HIST_VENTAS.HVD_CLIENTE IN (Select CUENTA from cuentaa) and HIST_VENTAS.HVD_RECHAZO = 0 order by HIST_VENTAS.HVD_CODPROMO desc, HIST_VENTAS.HVD_PRONOMBRE asc")
 	
 	
-	c=Starter.skmt.ExecQuery("select * from HIST_VENTAS WHERE hvd_rechazo <> 2 and HVD_RECHAZOCANT > 0 and HVD_CLIENTE NOT IN (SELECT CUENTA FROM CUENTAA) AND HVD_PROID IN (SELECT CAT_GP_ID FROM CAT_GUNAPROD WHERE CAT_GP_TIPO <> 'ALEN') order by HVD_CODPROMO desc, HVD_PRONOMBRE asc")
+'	c=Starter.skmt.ExecQuery("select * from HIST_VENTAS WHERE hvd_rechazo <> 2 and HVD_RECHAZOCANT > 0 and HVD_CLIENTE NOT IN (SELECT CUENTA FROM CUENTAA) AND HVD_PROID IN (SELECT CAT_GP_ID FROM CAT_GUNAPROD WHERE CAT_GP_TIPO <> 'ALEN') order by HVD_CODPROMO desc, HVD_PRONOMBRE asc")
+	c=Starter.skmt.ExecQuery("select * from HIST_VENTAS WHERE hvd_rechazo <> 2 and HVD_RECHAZOCANT > 0 and HVD_CLIENTE NOT IN (SELECT CUENTA FROM CUENTAA)  order by HVD_CODPROMO desc, HVD_PRONOMBRE asc")
 '	Private c2 As Cursor=Starter.skmt.ExecQuery("select  from PEDIDO WHERE PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA)")
 	
 	ListView1.Clear

B4A/Mazapa_Reparto.b4a

@@ -3009,7 +3009,7 @@ Version=12.8
 #Region Project Attributes 
 	#ApplicationLabel: MAZAPA Reparto
 	#VersionCode: 1
-	#VersionName: 5.07.25
+	#VersionName: 6.03.20
 	'Aun no la subo, suvela
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait

B4A/Mazapa_Reparto.b4a.meta

@@ -94,6 +94,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=Diseñador Visual,login.bal,-100,3,Starter,JobDone,149,0,B4XMainPage,i_engrane_Click,623,6,B4XMainPage,b_server_Click,682,0,Diseñador Visual,principal.bal,-100,1,C_Cliente,Class_Globals,0,0,B4XMainPage,Class_Globals,26,0,C_Productos,Class_Globals,0,0,C_Productos,B4XPage_Appear,200,6,C_Clientes,caculaRutaGPS,612,2,appUpdater,Process_Globals,74,1
+NavigationStack=C_Cliente,Class_Globals,0,0,B4XMainPage,Class_Globals,26,0,C_Clientes,caculaRutaGPS,612,2,appUpdater,Process_Globals,74,1,C_Productos,Class_Globals,0,0,C_Productos,B4XPage_Appear,93,6,B4XMainPage,B4XPage_Created,210,0,C_Principal,Class_Globals,61,6,C_Principal,JobDone,1481,6,C_Principal,cargar_Click,1130,0
 SelectedBuild=0
 VisibleModules=29,2,6,7,16,31,30,17,13,1

B4A/Objects/AndroidManifest.xml

@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	package="reparto_mazapa.keymon.lat"
-	android:versionCode="1"
-	android:versionName="5.07.25"
-	android:installLocation="internalOnly">
-	
-	<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="33"/>
-	<supports-screens android:largeScreens="true" 
-	    android:normalScreens="true"
-	    android:smallScreens="true"
-	    android:anyDensity="true"/>
-	<uses-permission
-	  android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-	  android:maxSdkVersion="33" />
-	<uses-permission
-	  android:name="android.permission.ACCESS_FINE_LOCATION"
-	  android:maxSdkVersion="33" />
-	<uses-permission
-	  android:name="android.permission.ACCESS_COARSE_LOCATION"
-	  android:maxSdkVersion="33" />
-	<uses-permission
-	  android:name="android.permission.READ_PHONE_STATE"
-	  android:maxSdkVersion="33" />
-	<uses-permission
-	  android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"
-	  android:maxSdkVersion="33" />
-	<uses-permission
-		android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-		android:maxSdkVersion="33" />
-	<uses-feature android:name="android.hardware.telephony" android:required="false" />
-	<uses-feature android:name="android.hardware.camera" android:required="false" />
-	<uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
-	<uses-feature android:name="android.hardware.camera.flash" android:required="false" />
-	<uses-permission
-		android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-		android:maxSdkVersion="33" />
-	<queries><package android:name="com.google.android.apps.maps" /></queries>
-	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-	<uses-permission android:name="android.permission.BLUETOOTH"/>
-	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
-	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-	<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-	<uses-permission android:name="android.permission.VIBRATE"/>
-	<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
-	<uses-permission android:name="android.permission.WAKE_LOCK"/>
-	<uses-permission android:name="android.permission.CAMERA"/>
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-	<uses-permission android:name="android.permission.INTERNET"/>
-	<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
-	<uses-permission android:name="reparto_mazapa.keymon.lat.permission.MAPS_RECEIVE"/>
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-	<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-	<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
-	<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
-	<uses-permission android:name="android.permission.INSTALL_PACKAGES"/>
-	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-	<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
-	<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE"/>
-	<uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
-	<uses-permission android:name="android.permission.BLUETOOTH_SCAN"/>
-	<application
-		android:icon="@drawable/icon"
-		android:label="MAZAPA Reparto"
-		android:theme="@style/LightTheme"
-		android:usesCleartextTraffic="true"
-		android:largeHeap="true"
-		android:allowBackup="false">
-		
-		<activity android:name="com.google.zxing.client.android.CaptureActivity"
-		android:screenOrientation="landscape" 
-		android:configChanges="orientation|keyboardHidden"
-		android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-		android:windowSoftInputMode="stateAlwaysHidden">
-		</activity>
-		<activity android:name="com.google.android.gms.common.api.GoogleApiActivity"
-		  android:theme="@android:style/Theme.Translucent.NoTitleBar"
-		  android:exported="false"/>
-		    <meta-data
-		  android:name="com.google.android.gms.version"
-		  android:value="@integer/google_play_services_version" />
-		<meta-data
-		  android:name="com.google.android.geo.API_KEY"
-		   android:value="AIzaSyBlBnx3O-DncOSv3oFIp-12wgujOYYcl-U"/>
-		  <meta-data android:name="com.google.android.gms.version"
-		   android:value="@integer/google_play_services_version" />
-		<uses-library
-		      android:name="org.apache.http.legacy"
-		      android:required="false" />
-		<provider
-			android:name="androidx.core.content.FileProvider"
-			android:authorities="reparto_mazapa.keymon.lat.provider"
-			android:exported="false"
-			android:grantUriPermissions="true">
-			<meta-data
-			android:name="android.support.FILE_PROVIDER_PATHS"
-			android:resource="@xml/provider_paths"/>
-			</provider>
-		<activity android:name="ice.zxing.CaptureActivity"
-			android:screenOrientation="portrait" android:configChanges="orientation|keyboardHidden"
-			android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-			android:windowSoftInputMode="stateAlwaysHidden">
-		</activity>
-		<provider
-				android:name="androidx.core.content.FileProvider"
-				android:authorities="reparto_mazapa.keymon.lat.provider"
-				android:exported="false"
-				android:grantUriPermissions="true">
-				<meta-data
-				android:name="android.support.FILE_PROVIDER_PATHS"
-				android:resource="@xml/provider_paths"/>
-			</provider>
-		<service android:name="b4a.jsaplication.com.br.ReplyAuto"
-			android:label="Mazapa" android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE" android:exported="true">
-		     <intent-filter><action android:name="android.service.notification.NotificationListenerService" /></intent-filter>
-		 </service>
-		<activity
-			android:windowSoftInputMode="stateHidden"
-			android:launchMode="singleTop"
-			android:name=".main"
-			android:label="MAZAPA Reparto"
-			android:screenOrientation="portrait"
-			android:exported="true">
-			<intent-filter>
-			   <action android:name="android.intent.action.MAIN" />
-			   <category android:name="android.intent.category.LAUNCHER" />
-			</intent-filter>
-			
-		</activity>
-		<service
-			android:name=".starter"
-			android:exported="true">
-		</service>
-		<receiver
-			android:name=".starter$starter_BR"
-			android:exported="true">
-		</receiver>
-		<service
-			android:name=".tracker"
-			android:exported="true"
-			android:foregroundServiceType="location">
-		</service>
-		<receiver
-			android:name=".tracker$tracker_BR"
-			android:exported="true">
-			<intent-filter>
-			<action android:name="android.intent.action.BOOT_COMPLETED"/>
-			</intent-filter>
-		</receiver>
-		<service
-			android:name=".appupdater"
-			android:exported="true">
-		</service>
-		<receiver
-			android:name=".appupdater$appupdater_BR"
-			android:exported="true">
-		</receiver>
-		<service
-			android:name=".firebasemessaging"
-			android:exported="true">
-		</service>
-		<receiver
-			android:name=".firebasemessaging$firebasemessaging_BR"
-			android:exported="true">
-		</receiver>
-		<activity
-			android:windowSoftInputMode="stateHidden"
-			android:launchMode="singleTop"
-			android:name=".foto"
-			android:label="MAZAPA Reparto"
-			android:screenOrientation="portrait"
-			android:exported="true">
-		</activity>
-		<activity
-			android:windowSoftInputMode="stateHidden"
-			android:launchMode="singleTop"
-			android:name=".mapa_cliente"
-			android:label="MAZAPA Reparto"
-			android:screenOrientation="portrait"
-			android:exported="true">
-		</activity>
-		<activity
-			android:windowSoftInputMode="stateHidden"
-			android:launchMode="singleTop"
-			android:name=".mapa_rutas"
-			android:label="MAZAPA Reparto"
-			android:screenOrientation="portrait"
-			android:exported="true">
-		</activity>
-		<service
-			android:name=".newinst2"
-			android:exported="true">
-		</service>
-		<receiver
-			android:name=".newinst2$newinst2_BR"
-			android:exported="true">
-		</receiver>
-		<receiver
-			android:name=".httputils2service"
-			android:exported="true">
-		</receiver>
-	</application>
-</manifest>

B4A/Objects/b4xlibs/Files/dialog.css

@@ -1,37 +0,0 @@
-.b4xdialog .scroll-bar:horizontal, .b4xdialog .scroll-bar:vertical{
-    -fx-background-color:transparent;
-}
-
-.b4xdialog .increment-button, .b4xdialog .decrement-button {
-    -fx-background-color: transparent;
-    -fx-border-color: transparent;
-}
-
-.b4xdialog .scroll-bar:horizontal .track,
-.b4xdialog .scroll-bar:vertical .track{
-    -fx-background-color: transparent;
-    -fx-border-color: transparent;
-    -fx-background-radius: 0em;
-}
-
-.b4xdialog .scroll-bar:horizontal .thumb,
-.b4xdialog .scroll-bar:vertical .thumb {
-   -fx-background-color: #4B4B4B; 
-    -fx-background-radius: 5em;
-}
-
-.b4xdialoglight .scroll-bar:horizontal .thumb,
-.b4xdialoglight .scroll-bar:vertical .thumb {
-   -fx-background-color: #B8B8B8; 
-}
-
-.scroll-pane{
-   -fx-background-color:transparent;
-}
-.scroll-pane .viewport {
-       -fx-background-color: transparent;
-}
-
-.text-area .content {
-    -fx-padding: 15 5 5 5;
-}