diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index b00db96..9cc6078 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -188,16 +188,18 @@ Sub B4XPage_Appear c = B4XPages.MainPage.skmt.ExecQuery($"select count(*) as hayPromos from ${Starter.tabla} where CAT_GP_TIPO = 'PROMOS'"$) c.Position = 0 - c = B4XPages.MainPage.skmt.ExecQuery($"SELECT CUENTA FROM CUENTAA"$) c.Position = 0 If c.GetString("CUENTA") <> "0" And c.GetString("CUENTA") <> "1" Then - c2=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_GP_ALMACEN, CAT_GP_IMG from ${Starter.tabla} where CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 AND CAT_GP_TIPO = ? AND CAT_GP_SUBTIPO = ? AND CAT_GP_ID NOT IN (SELECT PE_PROID FROM PEDIDO WHERE PE_CLIENTE IN (Select cuenta from cuentaa) )"$, Array As String("PROMOS", "PROMOS")) + c2=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_GP_ALMACEN, IFNULL(CAT_GP_IMG,0) AS CAT_GP_IMG from ${Starter.tabla} where CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 AND CAT_GP_TIPO = ? AND CAT_GP_SUBTIPO = ? AND CAT_GP_ID NOT IN (SELECT PE_PROID FROM PEDIDO WHERE PE_CLIENTE IN (Select cuenta from cuentaa))"$, Array As String("PROMOS", "PROMOS")) + LogColor($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_GP_ALMACEN, IFNULL(CAT_GP_IMG,0) AS CAT_GP_IMG from ${Starter.tabla} where CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 AND CAT_GP_TIPO = ? AND CAT_GP_SUBTIPO = ? AND CAT_GP_ID NOT IN (SELECT PE_PROID FROM PEDIDO WHERE PE_CLIENTE IN (Select cuenta from cuentaa))"$,Colors.Cyan) 'Isaac ' Log($"res:${c2.RowCount}, ${Value}, ${marca}, ${tipo}"$) Private hayPromos As Boolean = False If c2.RowCount > 0 Then + Log("Esto es un conteo --->"&c2.RowCount) 'Isaac For i=0 To c2.RowCount -1 - c2.Position=i + c2.Position = i + Log("Esto es i----->"& i)'Isaac Private tm As Map = Subs.procesaPromocion(c2.GetString("CAT_GP_ID"), clienteId) If tm.Get("status") = "ok" Then 'Solo muestrala si hay producto. hayPromos = True diff --git a/B4A/Files/cliente.bal b/B4A/Files/cliente.bal index 21b616d..5c65956 100644 Binary files a/B4A/Files/cliente.bal and b/B4A/Files/cliente.bal differ diff --git a/B4A/Files/guna_viejo.png b/B4A/Files/guna_viejo.png new file mode 100644 index 0000000..a0c3190 Binary files /dev/null and b/B4A/Files/guna_viejo.png differ diff --git a/B4A/Files/mapa_cliente.bal b/B4A/Files/mapa_cliente.bal new file mode 100644 index 0000000..8651810 Binary files /dev/null and b/B4A/Files/mapa_cliente.bal differ diff --git a/B4A/Files/profina.jpg b/B4A/Files/profina.jpg new file mode 100644 index 0000000..f092f0f Binary files /dev/null and b/B4A/Files/profina.jpg differ diff --git a/B4A/Files/profina.png b/B4A/Files/profina.png new file mode 100644 index 0000000..d307055 Binary files /dev/null and b/B4A/Files/profina.png differ diff --git a/B4A/MAPA_CLIENTE.bas b/B4A/MAPA_CLIENTE.bas new file mode 100644 index 0000000..28ab787 --- /dev/null +++ b/B4A/MAPA_CLIENTE.bas @@ -0,0 +1,115 @@ +B4A=true +Group=Default Group +ModulesStructureVersion=1 +Type=Activity +Version=9.95 +@EndOfDesignText@ +#Region Activity Attributes + #FullScreen: False + #IncludeTitle: FALSE + +#End Region + +Sub Process_Globals + Dim GPS As GPS + Dim rp As RuntimePermissions + Dim ruta As String + Dim skmt As SQL +End Sub + +Sub Globals + Private gmap As GoogleMap + Private MapFragment1 As MapFragment + Dim Latitud As Double = 0 + Dim Longitud As Double = 0 + Dim Lat2 As Double = 0 + Dim Lon2 As Double = 0 + Dim p1, p2 As Location + Dim Distance As Float + Dim boton1 As Button + Dim c As Cursor + Dim latmarker As String + Dim longmarker As String + Private l_long As Label + Private l_lat As Label + Private NOMBRE_TIENDA As String + Private p_principal As Panel + Private b_regresar As Button +End Sub + +Sub Activity_Create(FirstTime As Boolean) + Activity.LoadLayout("mapa_cliente") + If MapFragment1.IsGooglePlayServicesAvailable = False Then + ToastMessageShow("Please install Google Play Services.", True) + End If +End Sub + +Sub MapFragment1_Ready + gmap = MapFragment1.GetMap + 'permisos + rp.CheckAndRequest(rp.PERMISSION_ACCESS_FINE_LOCATION) + Wait For Activity_PermissionResult (Permission As String, Result As Boolean) + gmap.MyLocationEnabled = Result + 'fin de permisos + Dim JavaMapsObject As JavaObject + JavaMapsObject = gmap.GetUiSettings + JavaMapsObject.RunMethod("setMapToolbarEnabled", Array As Object(True)) + Dim marcador1 As Marker = gmap.AddMarker (latmarker,longmarker, "TIENDA") + marcador1.Snippet = B4XPages.MainPage.cliente.NOMBRE + 'posicion inicial + Dim aa As CameraPosition + aa.Initialize(latmarker,longmarker,15)''' RECOMENDABLE CAMBIAR A 10 SI ES MAS DE 1 MARCADOR + gmap.AnimateCamera(aa) +End Sub + +Sub GPS_LocationChanged (Parametro As Location) +' GPS.Start(0, 0) +' Dim sp As Int +' sp = Ceil(Parametro.Speed * 3.6) +' boton1.Text = sp &" "&"km/h" +' Latitud = Parametro.Latitude +' Longitud = Parametro.Longitude +' p2.Initialize2(Latitud,Longitud) +' p1.Initialize2(Lat2, Lon2) +' Distance = p1.DistanceTo(p2) +' If Latitud <> 0 And Longitud <> 0 Then +' If Distance > 10 Then +' Lat2 = Latitud +' Lon2 = Longitud +' Dim cp As CameraPosition +' cp.Initialize2(Parametro.Latitude, Parametro.Longitude, gmap.CameraPosition.Zoom, Parametro.Bearing, 0) +' gmap.AnimateCamera(cp) +' End If +' End If +End Sub + +Sub Activity_Resume + Subs.centraBoton(b_regresar, Activity.Width) + GPS.Initialize("GPS") + If GPS.GPSEnabled = False Then + ToastMessageShow("Debe Activar el GPS del Equipo.", True) + StartActivity(GPS.LocationSettingsIntent) + Else + GPS.Start(0, 0) + End If + Subs.centraPanel(p_principal, Activity.Width) + p_principal.Height = Activity.Height * 0.95 + latmarker = B4XPages.MainPage.cliente.LATITUD + longmarker = B4XPages.MainPage.cliente.LONGITUD + NOMBRE_TIENDA = B4XPages.MainPage.cliente.NOMBRE +End Sub + +Sub Activity_Pause (UserClosed As Boolean) + GPS.Stop +End Sub + +Sub reg_Click +' StartActivity(fila) + B4XPages.ShowPage("Cliente") +End Sub + +Private Sub b_regresar_Click + Log("Pressed") + Activity.Finish + B4XPages.ShowPage("Cliente") +End Sub \ No newline at end of file diff --git a/B4A/MARQUEZ.b4a b/B4A/MARQUEZ.b4a index d39e486..ff00289 100644 --- a/B4A/MARQUEZ.b4a +++ b/B4A/MARQUEZ.b4a @@ -7,56 +7,61 @@ File13=engrane_gris.png File14=folioabono.bal File15=fondo_kmt.jpg File16=gps20.png -File17=Hacer pedido.jpg -File18=hacerpedido30.jpg -File19=hacerpedido30.png +File17=guna_viejo.png +File18=Hacer pedido.jpg +File19=hacerpedido30.jpg File2=alert2.png -File20=intmex_logo_192x192.jpg -File21=intmex_logo_192x192.png -File22=itembuttonblue.png -File23=kmt.db -File24=login.bal -File25=Logo_192x192.jpg -File26=MainPage.bal -File27=Malo.jpg -File28=mapa_rutas.bal -File29=mariana.jpg +File20=hacerpedido30.png +File21=intmex_logo_192x192.jpg +File22=intmex_logo_192x192.png +File23=itembuttonblue.png +File24=kmt.db +File25=login.bal +File26=Logo_192x192.jpg +File27=logo_mariana.jpg +File28=MainPage.bal +File29=Malo.jpg File3=alerta_amarilla.png -File30=nota.bal -File31=noventa.bal -File32=nuevocliente.bal -File33=nuevocliente.jpg -File34=nuevo-cliente20.png -File35=Nvo Cliente.jpg -File36=palomita_verde.png -File37=PANEL_PICK_CIEGO.bal -File38=pedido.bal -File39=planfia_logo.png +File30=mapa_cliente.bal +File31=mapa_rutas.bal +File32=mariana.jpg +File33=nota.bal +File34=noventa.bal +File35=nuevocliente.bal +File36=nuevocliente.jpg +File37=nuevo-cliente20.png +File38=Nvo Cliente.jpg +File39=palomita_verde.png File4=anterior.jpg -File40=principal.bal -File41=proditem.bal -File42=proditem1.bal -File43=proditem2.bal -File44=productos.bal -File45=promociones.bal -File46=resdia.bal -File47=ResDia.jpg -File48=resdia20.png -File49=resumendia.jpg +File40=PANEL_PICK_CIEGO.bal +File41=pedido.bal +File42=planfia_logo.png +File43=principal.bal +File44=proditem.bal +File45=proditem1.bal +File46=proditem2.bal +File47=productos.bal +File48=profina.jpg +File49=PROFINA.png File5=bus-ar.png -File50=salma.jpg -File51=salma.png -File52=scrollpromos.bal -File53=senial.jpg -File54=sync.png -File55=tache_rojo.png -File56=Ticket dia.jpg -File57=ticketdia20.jpg -File58=ticketdia20.png -File59=ticketsdia.bal +File50=promociones.bal +File51=resdia.bal +File52=ResDia.jpg +File53=resdia20.png +File54=resumendia.jpg +File55=salma.jpg +File56=salma.png +File57=scrollpromos.bal +File58=senial.jpg +File59=sync.png File6=carrito.png -File60=Tiendita.jpg -File61=verde.png +File60=tache_rojo.png +File61=Ticket dia.jpg +File62=ticketdia20.jpg +File63=ticketdia20.png +File64=ticketsdia.bal +File65=Tiendita.jpg +File66=verde.png File7=celltitle.bal File8=cliente.bal File9=clientes.bal @@ -118,6 +123,11 @@ FileGroup59=Default Group FileGroup6=Default Group FileGroup60=Default Group FileGroup61=Default Group +FileGroup62=Default Group +FileGroup63=Default Group +FileGroup64=Default Group +FileGroup65=Default Group +FileGroup66=Default Group FileGroup7=Default Group FileGroup8=Default Group FileGroup9=Default Group @@ -173,22 +183,23 @@ Module20=DBRequestManager Module21=EscPosPrinter Module22=FileHandler Module23=ManageExternalStorage -Module24=MAPA_RUTAS -Module25=NotificationService -Module26=Pendientes -Module27=Starter -Module28=Subs -Module29=Tracker +Module24=MAPA_CLIENTE +Module25=MAPA_RUTAS +Module26=NotificationService +Module27=Pendientes +Module28=Starter +Module29=Subs Module3=BatteryUtilities +Module30=Tracker Module4=C_Cliente Module5=C_Clientes Module6=C_Cuestionario Module7=C_Historico Module8=C_Mapas Module9=C_Nota -NumberOfFiles=61 +NumberOfFiles=66 NumberOfLibraries=34 -NumberOfModules=29 +NumberOfModules=30 Version=12.8 @EndOfDesignText@ #Region Project Attributes diff --git a/B4A/MARQUEZ.b4a.meta b/B4A/MARQUEZ.b4a.meta index 20e9e78..4ba5671 100644 --- a/B4A/MARQUEZ.b4a.meta +++ b/B4A/MARQUEZ.b4a.meta @@ -22,6 +22,7 @@ ModuleBookmarks27= ModuleBookmarks28= ModuleBookmarks29= ModuleBookmarks3= +ModuleBookmarks30= ModuleBookmarks4= ModuleBookmarks5= ModuleBookmarks6= @@ -52,6 +53,7 @@ ModuleBreakpoints27= ModuleBreakpoints28= ModuleBreakpoints29= ModuleBreakpoints3= +ModuleBreakpoints30= ModuleBreakpoints4= ModuleBreakpoints5= ModuleBreakpoints6= @@ -82,12 +84,13 @@ ModuleClosedNodes27= ModuleClosedNodes28= ModuleClosedNodes29= ModuleClosedNodes3= +ModuleClosedNodes30= ModuleClosedNodes4= ModuleClosedNodes5= ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Cliente,b_abono1_Click,2340,0,C_Cliente,b_cancelar_Click,2337,0,C_Cliente,b_abono_Click,2325,0,C_Cliente,b_cxc_LongClick,2616,1,C_Cliente,imprime_pagare,2579,6,Main,Globals,24,0,Main,Activity_Create,31,0,C_Cliente,MODS,0,0,Diseñador Visual,cliente.bal,-100,6,C_Cliente,Guardar_Click,688,6 +NavigationStack=Diseñador Visual,productos.bal,-100,2,C_Productos,b_terminar1_Click,872,0,C_Productos,B4XPage_Appear,197,6,C_Cliente,NUEVO_Click,919,0,C_Cliente,GUADAVENTA2,838,0,MAPA_CLIENTE,Globals,18,0,Diseñador Visual,cliente.bal,-100,6,MAPA_CLIENTE,Activity_Resume,90,0,Diseñador Visual,mapa_cliente.bal,-100,3,MAPA_CLIENTE,GPS_LocationChanged,60,0 SelectedBuild=0 -VisibleModules=1,2,13,4,7,8,9,10,14,28 +VisibleModules=1,2,13,4,7,8,9,10,14,29,24