- VERSION 5.01.18

- Se agrego la opcion "Cerrado Permanente" a los motivos de "No Venta"

B4A/B4XMainPage.bas

@@ -182,6 +182,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS kmt_info (CAT_CL_FOTO BLOB, CAT_CL_NUM_SERIEFISICO TEXT, CAT_CL_MTOCOMPRA TEXT, CAT_CL_CEDIS TEXT, CAT_CL_LAT TEXT, CAT_CL_LONG TEXT, CAT_CL_FBAJA TEXT, CAT_CL_FALTA TEXT, CAT_CL_CP TEXT, CAT_CL_EDO TEXT, CAT_CL_MUNI TEXT, CAT_CL_COLONIA TEXT, CAT_CL_CALLE2 TEXT, CAT_CL_CALLE1 TEXT, CAT_CL_NOINT TEXT, CAT_CL_NOEXT TEXT, CAT_CL_CALLE TEXT, CAT_CL_EMAIL TEXT, CAT_CL_TELEFONO TEXT, CAT_CL_ATIENTE2 TEXT, CAT_CL_ATIENDE1 TEXT, CAT_CL_NOMBRE TEXT, CAT_CL_GIRO TEXT, CAT_CL_DIAS_VISITA TEXT, CAT_CL_TIPO_RUTA TEXT, CAT_CL_RUTA TEXT, CAT_CL_CODIGO TEXT, gestion NUMERIC, CAT_CL_DIASEMANA TEXT, CAT_CL_SECUENCIA INT)")
 	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS VENDIDOS(ID TEXT)")
 	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_PROMOS_RUTA (CPR_IDALMACEN TEXT, CPR_RUTA TEXT, CPR_PROMO TEXT, CPR_CANT INT)")
+	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_PEDIDOS_YALO (PY_TICKET TEXT, PY_IDCLIENTE TEXT, PY_PRODID TEXT, PY_PRODNOMBRE TEXT, PY_MARCANOMBRE TEXT, PY_COSTO_TOT TEXT, PY_CANT TEXT, PY_FECHA TEXT)")
 	
 	Subs.agregaColumna("PEDIDO", "PE_ENVIO_OK", "TEXT")
 	Subs.agregaColumna("HIST_CLIENTE_CANT_PROMOS", "HCCP_CANT_VENDIDA", "TEXT")

B4A/C_Cliente.bas

@@ -141,6 +141,9 @@ Sub Class_Globals
 	Private l_calle1 As Label
 	Private l_ubicacion2 As Label
 	Private l_version As Label
+	Private b_pedidoYalo As Button
+	Private p_transYalo As Panel
+	Private lv_yalo As ListView
 End Sub
 
 'You can add more parameters here.
@@ -187,6 +190,11 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	End If
 	c.Close
 	s.Close
+	p_transYalo.Width = Root.Width : p_transYalo.Height = Root.Height
+	p_transYalo.Top = 0 : p_transYalo.Left = 0
+	lv_yalo.Width = Root.Width * 0.9 : lv_yalo.Height = Root.Height * 0.8
+	lv_yalo.Left = (Root.Width / 2) - (lv_yalo.Width / 2)
+	lv_yalo.top = (Root.Height / 2) - (lv_yalo.Height / 2)
 	btAdmin.Initialize("BlueTeeth")
 	cmp20.Initialize("Printer")
 End Sub
@@ -409,7 +417,9 @@ Private Sub B4XPage_CloseRequest As ResumableSub
 '	BACK key pressed
 '	Return True To close, False To cancel
 '	Log($"venimosDeTicketsDia=${venimosDeTicketsDia}"$)
-	If IsNumber(l_total.text) And l_total.text <> "0" And Not(Subs.pedidoGuardado) Then
+	If p_transYalo.Visible Then
+		p_transYalo.Visible = False
+	else If IsNumber(l_total.text) And l_total.text <> "0" And Not(Subs.pedidoGuardado) Then
 		LogColor("Hay Venta", Colors.Red)
 		Private resultado1 As Int = Msgbox2($"Va salir sin haber guardado la venta, si continua, la venta se BORRARA.${CRLF}${CRLF}¿Esta seguro que desea continuar?"$, "SE VA A BORRAR LA VENTA", "Borrar Venta", "Guardar Venta", "", LoadBitmap(File.DirAssets,"alert2.png"))
 		If resultado1 = DialogResponse.POSITIVE Then
@@ -926,11 +936,10 @@ Sub JobDone(Job As HttpJob)
 		End If
 		Job.Release
 	End If
-	
 End Sub
 
 Private Sub p_abono_Click
-	
+
 End Sub
 
 Private Sub b_abono_Click
@@ -955,4 +964,28 @@ End Sub
 
 Private Sub b_abono1_Click
 	p_abono.Visible = True
+End Sub
+
+Private Sub b_pedidoYalo_Click
+	Private rs As ResultSet = Starter.skmt.ExecQuery($"select * from CAT_PEDIDOS_YALO where PY_IDCLIENTE = '${Subs.traeCliente}' order by PY_FECHA, PY_TICKET"$)
+	Private ticket As String = ""
+	Private cs As CSBuilder
+	Private label1 As B4XView = lv_yalo.SingleLineLayout.Label
+	lv_yalo.Clear
+	Do While rs.NextRow
+	label1.Left = 75dip
+		If ticket <> rs.GetString("PY_TICKET") Then
+			cs.Initialize
+			ticket = rs.GetString("PY_TICKET")
+			lv_yalo.AddSingleLine(cs.Size(16).Color(Colors.red).append("Pedido: " & ticket & " - " & rs.GetString("PY_FECHA").SubString2(0, rs.GetString("PY_FECHA").IndexOf(" "))).popAll)
+		End If
+		cs.Initialize
+		lv_yalo.AddSingleLine(cs.Size(13).Color(Colors.DarkGray).append(rs.GetString("PY_PRODNOMBRE") & " - Cant: " & rs.GetString("PY_CANT")).popAll)
+	Loop
+	
+	p_transYalo.Visible = True
+End Sub
+
+Private Sub p_transYalo_Click
+	p_transYalo.Visible = False
 End Sub

B4A/C_NoVenta.bas

@@ -18,6 +18,8 @@ Sub Class_Globals
 	Dim r_1 As RadioButton
 	Dim r_2 As RadioButton
 	Dim r_3 As RadioButton
+	Dim r_4 As RadioButton
+	Dim r_5 As RadioButton
 	Dim e_comm As EditText
 	Dim motivo As String
 	Dim cuenta As String
@@ -25,7 +27,6 @@ Sub Class_Globals
 	Dim sDate,sTime As String
 '	Dim lat_gps, lon_gps As String
 	Dim tgl As Toggle
-	Dim r_4 As RadioButton
 	
 	Private stay_hh As String
 	Private stay_mi As String
@@ -40,7 +41,7 @@ End Sub
 
 'This event will be called once, before the page becomes visible.
 Private Sub B4XPage_Created (Root1 As B4XView)
-	B4XPages.SetTitle(Me, $"${subs.capitalizar(B4XPages.GetPageId(Me))} - ${Application.VersionName}"$)
+	B4XPages.SetTitle(Me, $"${Subs.capitalizar(B4XPages.GetPageId(Me))} - ${Application.VersionName}"$)
 	Root = Root1
 	'load the layout to Root
 	Root.LoadLayout("noventa")
@@ -79,8 +80,10 @@ Sub GUARDA_Click
 		motivo = "NO COMPRA"
 	Else If r_3.Checked Then
 		motivo = "CON PRODUCTO"
-	Else
+	Else If r_4.Checked Then
 		motivo = "NO ESTA EL ENCARGADO"
+	Else
+		motivo = "CERRADO PERMANENTE"
 	End If
 	DateTime.DateFormat = "MM/dd/yyyy"
 	sDate=DateTime.Date(DateTime.Now)

B4A/C_Principal.bas

@@ -817,6 +817,7 @@ Sub cargar_Click
 		Starter.skmt.ExecNonQuery("DELETE FROM HIST_GEOCERCA")
 		Starter.skmt.ExecNonQuery("DELETE FROM HIST_MARCAS_CUOTAS")
 		Starter.skmt.ExecNonQuery("DELETE FROM HIST_AVANCE")
+		Starter.skmt.ExecNonQuery("DELETE FROM CAT_PEDIDOS_YALO")
 
 		c = Starter.skmt.ExecQuery2("select count(CAT_VA_DESCRIPCION) as HoraIngreso from cat_variables where CAT_VA_DESCRIPCION = ? ", Array As String("HoraIngreso"))
 		c.Position = 0
@@ -901,6 +902,12 @@ Sub cargar_Click
 		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
 		reqManager.ExecuteQuery(cmd , 0, "hist_cliente_promos")
 	
+		cmd.Initialize
+		cmd.Name = "selectPedidosYalo_MARDS"
+		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
+		Log($"Ruta: |${e_ruta.text}|, Almacen: |${ALMACEN}|"$)
+		reqManager.ExecuteQuery(cmd , 0, "pedidos_yalo")
+	
 '	cmd.Initialize
 '	cmd.Name = "select_HIST_MARCAS_CUOTAS_INTMEX"
 '	cmd.Parameters = Array As Object( ALMACEN, e_ruta.text)
@@ -1015,7 +1022,7 @@ Sub JobDone(Job As HttpJob)
 			End If
 		End If
 	Else 'If Job Success then ...
-		LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.Green)  'Mod por CHV - 211027
+		LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.red)  'Mod por CHV - 211027
 		'Verificamos que el usuario guardado en BD sea VALIDO.
 		If Job.JobName = "DBRequest" Then
 			Dim RESULT As DBResult = reqManager.HandleJob(Job)
@@ -1051,8 +1058,9 @@ Sub JobDone(Job As HttpJob)
 					Msgbox("Usuario Cancelado llamar al administrador","") 'ignore
 					B4XPages.ShowPage("B4XMainPage")
 				Else
+					Starter.skmt.ExecNonQuery("Delete from usuarioa")
 					Msgbox("Usuario o password No validos","") 'ignore
-					B4XPages.ShowPage("B4XMainPage")
+					B4XPages.ShowPage("Login")
 				End If
 				Log("*****************  "&n)
 			End If
@@ -1767,6 +1775,21 @@ Sub JobDone(Job As HttpJob)
 					Starter.skmt.ExecNonQuery2("INSERT INTO CAT_PROMOS_RUTA(CPR_RUTA, CPR_PROMO, CPR_CANT, CPR_IDALMACEN) VALUES (?,?,?,?)", Array As Object (CPR_RUTA, CPR_PROMO, CPR_CANT, CPR_IDALMACEN))
 				Next
 			End If
+
+			Dim RESULT As DBResult = reqManager.HandleJob(Job)
+			If RESULT.Tag = "pedidos_yalo" Then 'query tag
+				For Each records() As Object In RESULT.Rows
+					Dim PY_IDCLIENTE As String = records(RESULT.Columns.Get("HVD_CLIENTE"))
+					Dim PY_PRODID As String = records(RESULT.Columns.Get("HVD_PROID"))
+					Dim PY_PRODNOMBRE As String = records(RESULT.Columns.Get("HVD_PRONOMBRE"))
+					Dim PY_MARCANOMBRE As String = records(RESULT.Columns.Get("HVD_MARCANOMBRE"))
+					Dim PY_COSTO_TOT As String = records(RESULT.Columns.Get("HVD_COSTO_TOT"))
+					Dim PY_CANT As String = records(RESULT.Columns.Get("HVD_CANT"))
+					Dim PY_FECHA As String = records(RESULT.Columns.Get("HVD_FECHA"))
+					Dim PY_TICKET As String = records(RESULT.Columns.Get("HVD_NUM_TICKET"))
+					Starter.skmt.ExecNonQuery2("INSERT INTO CAT_PEDIDOS_YALO(PY_IDCLIENTE, PY_PRODID, PY_PRODNOMBRE, PY_MARCANOMBRE, PY_COSTO_TOT, PY_CANT, PY_FECHA, PY_TICKET) VALUES (?,?,?,?,?,?,?,?)", Array As Object (PY_IDCLIENTE, PY_PRODID, PY_PRODNOMBRE, PY_MARCANOMBRE, PY_COSTO_TOT, PY_CANT, PY_FECHA, PY_TICKET))
+				Next
+			End If
 		End If
 	End If
 	Job.Release

B4A/Mariana.b4a

@@ -1093,7 +1093,7 @@ Version=12.8
 #Region  Project Attributes 
 	#ApplicationLabel: Mariana
 	#VersionCode: 1
-	#VersionName: 4.07.20
+	#VersionName: 5.01.18
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False

B4A/Mariana.b4a.meta

@@ -76,12 +76,12 @@ ModuleClosedNodes25=
 ModuleClosedNodes26=
 ModuleClosedNodes27=
 ModuleClosedNodes3=
-ModuleClosedNodes4=2
+ModuleClosedNodes4=
 ModuleClosedNodes5=
 ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Principal,B4XPage_Appear,474,0,MAPA_RUTAS,MapFragment1_Ready,146,0,C_Productos,lv_catalogos_ItemClick,251,6,Visual Designer,principal.bal,-100,3,C_Productos,llenaCatalogo,365,0,C_Productos,lv_promos_ItemClick,340,5,C_Productos,lv_catalogos2_ItemClick,335,0,C_Principal,Class_Globals,0,0,C_Principal,JobDone,1238,0,B4XMainPage,JobDone,474,0
+NavigationStack=C_Cliente,Tels_Click,407,0,C_Cliente,b_abono_Click,951,0,C_Cliente,b_abono1_Click,961,0,Visual Designer,cliente.bal,-100,6,C_Cliente,b_pedidoYalo_Click,969,6,C_Principal,Class_Globals,0,0,Visual Designer,noventa.bal,-100,4,C_NoVenta,Class_Globals,23,1,C_NoVenta,GUARDA_Click,149,2,C_Principal,cargar_Click,884,0
 SelectedBuild=0
-VisibleModules=2,12,4,5,6,26,10,16,8,13
+VisibleModules=2,12,4,5,6,26,10,16,8,13,9