- VERSION 5.08.05

- Se corrigio en la impresion de ticket que cuando no habia venta a credito y lo trataba de imprimir tronaba por valor nulo.

B4A/B4XMainPage.bas

@@ -887,7 +887,7 @@ End Sub
 Sub i_engrane_Click
 	lv_server.Clear
 	ime.HideKeyboard
-	lv_server.AddSingleLine("http://keymon.lat:1781")
+	lv_server.AddSingleLine("http://keymon.net:1781")
 '	lv_server.AddSingleLine("http://keymon.lat:1781")
 	If user.Text = "KMTS1" Then lv_server.AddSingleLine("http://10.0.0.205:1781")
 '	lv_server.AddSingleLine("http://40.123.36.38:1782")

B4A/C_Cliente.bas

@@ -1295,18 +1295,20 @@ Sub imprime_preventa
 				Printer1.WriteString(" " & eLINEFEED)
 			End If
 			s.Close
-            
+
 			'Totales por tipo de preventa
-			s=skmt.ExecQuery2("select SUM(PE_COSTO_TOT) AS TOTAL FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As String(tipo))
-			s.Position =0
+			s=skmt.ExecQuery2("select ifnull(SUM(PE_COSTO_TOT),0) AS TOTAL FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As String(tipo))
+			s.Position = 0
+			Log(s.RowCount)
+			Log("Total " & tipo.ToLowerCase & ":   $" & s.GetString("TOTAL"))
 			Printer1.WriteString("Total " & tipo.ToLowerCase & ":   $" & NumberFormat(s.GetString("TOTAL"),0,2) & eLINEFEED)
 			s.Close
             
-			c= skmt.ExecQuery2("select sum(PE_CANT) as PC_NOART from PEDIDO where PE_CLIENTE in (Select CUENTA from cuentaa) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP ) AND PE_FOLIO = ?", Array As String(tipo))
+			c= skmt.ExecQuery2("select ifnull(sum(PE_CANT),0) as PC_NOART from PEDIDO where PE_CLIENTE in (Select CUENTA from cuentaa) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP ) AND PE_FOLIO = ?", Array As String(tipo))
 			C.Position=0
 			Printer1.WriteString("Total art. " & tipo.ToLowerCase & ": " & NumberFormat(c.GetString("PC_NOART"),0,0) & eLINEFEED)
 			c.Close
-            
+
 			'Información adicional para crédito
 			If tipo = "PREVENTA_CREDITO" Then
 				Dim siesacredi As Cursor = skmt.ExecQuery("SELECT * FROM PAGARES WHERE PA_CLIENTE IN (SELECT CUENTA FROM CUENTAA)")

B4A/C_NoVenta.bas

@@ -112,6 +112,7 @@ Sub GUARDA_Click
 		B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 3  where CAT_CL_CODIGO In (select cuenta from cuentaa)")
 	Else
 		B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO  NOVENTA (NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON) VALUES(?,?,?,?,?,?,?) ", Array As Object (cuenta,sDate & sTime, usuario, motivo,e_comm.text, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps))
+		B4XPages.MainPage.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 3  where CAT_CL_CODIGO In (select cuenta from cuentaa)")
 	End If
 	DateTime.TimeFormat = "HHmmss"
 	sTime=DateTime.Time(DateTime.Now)

B4A/C_Principal.bas

@@ -451,7 +451,7 @@ Sub B4XPage_Appear
 		pnlBtnCobranza.Visible = False
 	Else
 		p_b_tabulador.Visible = True
-		pnlBtnCobranza.Visible = True
+		pnlBtnCobranza.Visible = False
 		f=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info")
 		f.Position=0
 		l_ruta.Text = f.GetString("CAT_CL_RUTA")
@@ -529,13 +529,44 @@ Sub B4XPage_Appear
 	c.Position = 0
 	usuario = c.GetString("USUARIO")
 	c.Close
+'	B4XPages.MainPage.batt = batterystatus(0)
+'	B4XPages.MainPage.montoActual = L_MONTOD.Text
+'	B4XPages.MainPage.clientestotal = L_CUANTOST.Text
+'	B4XPages.MainPage.clientesventa =  l_cuantosc.Text
+'	B4XPages.MainPage.clientesvisitados = l_porvisitar.TEXT
+'	B4XPages.MainPage.ALMACEN = ALMACEN
+'	B4XPages.MainPage.rutapreventa =  l_ruta.text
+
+	Dim conVen As Int = 0
+	Dim sinVen As Int = 0
+
+	Dim cursor As Cursor = Starter.skmt.ExecQuery($"SELECT SUM(PE_COSTO_TOT) AS PE_COSTO_TOT, COUNT(DISTINCT PE_CLIENTE) AS PE_CLIENTE FROM PEDIDO WHERE PE_FOLIO <> 'RECARGA'"$)
+	If cursor.RowCount > 0 Then
+		cursor.Position = 0
+		B4XPages.MainPage.montoActual = cursor.GetString("PE_COSTO_TOT")
+		B4XPages.MainPage.clientesventa = cursor.GetString("PE_CLIENTE")
+		conVen = cursor.GetInt("PE_CLIENTE")
+	End If
+	Log("Clientes con venta: " & conVen)
+
+	Dim cNoVenta As Cursor = Starter.skmt.ExecQuery($"SELECT COUNT(DISTINCT NV_CLIENTE) AS NV_CLIENTE FROM NOVENTA"$)
+	If cNoVenta.RowCount > 0 Then
+		cNoVenta.Position = 0
+		sinVen = cNoVenta.GetInt("NV_CLIENTE")
+		
+		Log("Clientes sin venta: " & sinVen)
+
+		Dim totClientes As Int = sinVen + conVen
+		Log("Total clientes visitados: " & totClientes)
+		
+	End If
+
+
 	B4XPages.MainPage.batt = batterystatus(0)
-	B4XPages.MainPage.montoActual = L_MONTOD.Text
-	B4XPages.MainPage.clientestotal = L_CUANTOST.Text
-	B4XPages.MainPage.clientesventa =  l_cuantosc.Text
-	B4XPages.MainPage.clientesvisitados = l_porvisitar.TEXT
+	B4XPages.MainPage.clientestotal = totClientes
+	B4XPages.MainPage.clientesvisitados = l_porvisitar.Text
 	B4XPages.MainPage.ALMACEN = ALMACEN
-	B4XPages.MainPage.rutapreventa =  l_ruta.text
+	B4XPages.MainPage.rutapreventa = l_ruta.Text
 	
 	'//////  Para el usuario global - Chv
 	c=B4XPages.MainPage.skmt.ExecQuery("select usuario from usuarioa")
@@ -613,6 +644,7 @@ Sub B4XPage_Appear
 
 	fg.Close
 	
+	checaPedido
 	'-----------------------------
 End Sub
 

B4A/MARQUEZ.b4a

@@ -206,12 +206,12 @@ Module9=C_Nota
 NumberOfFiles=69
 NumberOfLibraries=33
 NumberOfModules=31
-Version=13.1
+Version=12.8
 @EndOfDesignText@
 #Region  Project Attributes 
 	#ApplicationLabel: Marquez
 	#VersionCode: 1
-	#VersionName: 5.06.01
+	#VersionName: 5.08.05
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False

B4A/MARQUEZ.b4a.meta

@@ -94,6 +94,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=Diseñador Visual,principal.bal,-100,6,C_Principal,btnCobranza_Click,2994,6,Main,Activity_KeyPress,40,0,Main,Activity_ActionBarHomeClick,37,0,Main,Create_Menu,56,0,B4XMainPage,i_engrane_Click,883,0,C_Nota,Class_Globals,0,0,C_Nota,B4XPage_Appear,124,0,C_Nota,borra_Click,296,0,C_Nota,ListView1_ItemLongClick,302,0
+NavigationStack=Subs,traeTablaProds,1565,0,Subs,traeMaxPromos,1184,6,C_NoVenta,GUARDA_Click,108,0,Diseñador Visual,principal.bal,-100,1,C_Principal,B4XPage_Appear,420,1,C_Cliente,Class_Globals,147,0,C_Cliente,GPS_LocationChanged,526,0,C_Principal,JobDone,2238,0,C_Principal,cargar_Click,1183,0,C_Principal,getTableColumnList,377,0,C_Cliente,imprime_preventa,1304,4
 SelectedBuild=0
 VisibleModules=1,2,13,4,5,7,8,9,10,14

B4A/Starter.bas

@@ -20,7 +20,8 @@ Sub Process_Globals
 	Public FLP As FusedLocationProvider
 '	Private flpStarted As Boolean
 	Dim reqManager As DBRequestManager
-	Dim DBReqServer As String = "http://187.189.244.154:1781"
+'	Dim DBReqServer As String = "http://187.189.244.154:1781"
+	Dim DBReqServer As String = "http://keymon.net:1781"
 '	Dim DBReqServer As String = "http://11.0.0.107:1781"
 '	Dim DBReqServer As String = "http://10.0.0.205:1783"
 '	Dim DBReqServer As String = "http://192.168.100.10:1781"

B4A/Subs.bas

@@ -1188,21 +1188,27 @@ Sub traeMaxPromos(pm As Map) As Int
 	Dim totalActual As Float = 0
 	Dim maxPromosXCreditoDisponible As Int
 	'Traemos el total del pedido actual.
-	Dim fg As Cursor = Starter.skmt.ExecQuery("Select IFNULL(sum(PE_COSTO_TOT),0) AS TOT_ACTUAL FROM PEDIDO WHERE PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA) AND PE_FOLIO = 'PREVENTA_CREDITO'")
-	fg.Position = 0	
-	totalActual = fg.GetString("TOT_ACTUAL")
-	'Calculamos el credito que tenemos disponible.
-	Dim creditoDisponible As Float = creditoOtorgado - totalActual
-	'Calculamos las promos disponibles deacuerdo a lo que nos alcanza con el credito disponible.
-	maxPromosXCreditoDisponible = creditoDisponible / precioPromo
-	Log("Maximo de promos disponibles: " & maxPromosXCreditoDisponible)
-	Log((fg.GetString("TOT_ACTUAL")) & " Monto Actual<-------")
-	If fg.GetString("TOT_ACTUAL") + precioPromo > creditoOtorgado Then
-		maxPromosXCreditoDisponible = 0
+	If B4XPages.MainPage.tipo_venta = "PREVENTA_CREDITO" Then
+		Dim checacredito As Cursor = Starter.skmt.ExecQuery("Select CAT_CL_BCREDITO FROM kmt_info where CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)")
+		checacredito.Position = 0
+		If checacredito.GetString("CAT_CL_BCREDITO") = "1" Then
+			Dim fg As Cursor = Starter.skmt.ExecQuery("Select IFNULL(sum(PE_COSTO_TOT),0) AS TOT_ACTUAL FROM PEDIDO WHERE PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA) AND PE_FOLIO = 'PREVENTA_CREDITO'")
+			fg.Position = 0
+			totalActual = fg.GetString("TOT_ACTUAL")
+			'Calculamos el credito que tenemos disponible.
+			Dim creditoDisponible As Float = creditoOtorgado - totalActual
+			'Calculamos las promos disponibles deacuerdo a lo que nos alcanza con el credito disponible.
+			maxPromosXCreditoDisponible = creditoDisponible / precioPromo
+			Log("Maximo de promos disponibles: " & maxPromosXCreditoDisponible)
+			Log((fg.GetString("TOT_ACTUAL")) & " Monto Actual<-------")
+			If fg.GetString("TOT_ACTUAL") + precioPromo > creditoOtorgado Then
+				Log("PENDEJADAS DE ISAAC")
+				maxPromosXCreditoDisponible = 0
+			End If
+			maxPromos.Add(maxPromosXCreditoDisponible.As(String)) 'Agregamos Maxpromos X Credito Disponible
+		End If
+		Log(maxPromos)
 	End If
-	maxPromos.Add(maxPromosXCreditoDisponible.As(String)) 'Agregamos Maxpromos X Credito Disponible
-	
-	
 	maxPromos.Sort(True)
 	
 '	Log($"|${pm.Get("id").As(String).trim}|${traeCliente.Trim}|"$)