diff --git a/B4A/C_Bitacora.bas b/B4A/C_Bitacora.bas index 4f58dee..1460e43 100644 --- a/B4A/C_Bitacora.bas +++ b/B4A/C_Bitacora.bas @@ -34,6 +34,7 @@ End Sub Private Sub B4XPage_Created (Root1 As B4XView) Root = Root1 'load the layout to Root + Subs.centraBoton(b_Inicio_Fin_venta2, Root.Width) End Sub 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage. @@ -185,8 +186,10 @@ private Sub cargamosPanel p_transparenteInicioFin2.Width = Root2.Width p_transparenteInicioFin2.Height = Root2.Height b_Inicio_Fin_venta2.top = 700 + if B4XPages.MainPage.cliente.Tar.IsInitialized then b_Inicio_Fin_venta2.top = B4XPages.MainPage.cliente.Tar.top b_Inicio_Fin_venta2.Left = 5 b_Inicio_Fin_venta2.Width = Root2.Width - 20 + b_Inicio_Fin_venta2.Left = (Root2.Width / 2) - (b_Inicio_Fin_venta2.width / 2) b_Inicio_Fin_venta2.Text = "INICIAR VENTA" p_transparenteInicioFin2.BringToFront End If diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index bfe2d6e..dd5f9e4 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -173,6 +173,7 @@ Sub Class_Globals Dim siimprimio As String = 0 + Private p_transparenteInicioFin As Panel End Sub 'You can add more parameters here. @@ -249,9 +250,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) ' End If ' h.Close ' j.Close - - - + p_transparenteInicioFin.Top = 0 : p_transparenteInicioFin.Left = 0 End Sub 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage. @@ -545,7 +544,7 @@ Sub GPS_LocationChanged (Location1 As Location) 'now we need the distance between our location and the target location distance = l1.DistanceTo(l2) 'the result is in meter gest.Visible = True - If distance < 50 Then + If distance < 500000000000 Then LA_GEO.TextColor = Colors.Blue Tels.Visible = True gest.Visible = True diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index 48e8a0d..0f45ebe 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -1147,7 +1147,13 @@ Private Sub clv_prods_ll_VisibleRangeChanged (FirstIndex As Int, LastIndex As In Pnl.SetLayoutAnimated(0,0,0,Pnl.Width,145dip) Private cs As CSBuilder cs.Initialize - l_prodX.SetTextSizeAnimated(0, 13) + l_prodX.SetTextSizeAnimated(0, 16) + + et_pCant.TextColor=Colors.black + et_pCant.TextSize = 9dip + et_pCantc.TextColor=Colors.black + et_pCantc.TextSize = 9dip + If clv_prods_ll.GetValue(i).As(Map).Get("cant") <> Null And clv_prods_ll.GetValue(i).As(Map).Get("cant") > 0 Then p_prods.Color=0xFFE2EEFF et_pCant.TextColor=Colors.Red diff --git a/B4A/Files/cliente.bal b/B4A/Files/cliente.bal index 0d872ac..c8a01b1 100644 Binary files a/B4A/Files/cliente.bal and b/B4A/Files/cliente.bal differ diff --git a/B4A/Files/iniciofinventa.bal b/B4A/Files/iniciofinventa.bal index 6fd3b89..1ed6da3 100644 Binary files a/B4A/Files/iniciofinventa.bal and b/B4A/Files/iniciofinventa.bal differ diff --git a/B4A/Files/proditem.bal b/B4A/Files/proditem.bal index 8145506..8d3bda2 100644 Binary files a/B4A/Files/proditem.bal and b/B4A/Files/proditem.bal differ diff --git a/B4A/MAZAPA.b4a b/B4A/MAZAPA.b4a index 1fbfb8a..2a0abf0 100644 --- a/B4A/MAZAPA.b4a +++ b/B4A/MAZAPA.b4a @@ -44,27 +44,26 @@ File47=proditem1.bal File48=proditem2.bal File49=productos.bal File5=bus-ar.png -File50=productos.png -File51=profina.jpg -File52=PROFINA.png -File53=promociones.bal -File54=resdia.bal -File55=ResDia.jpg -File56=resdia20.png -File57=resumendia.jpg -File58=salma.jpg -File59=salma.png +File50=profina.jpg +File51=PROFINA.png +File52=promociones.bal +File53=resdia.bal +File54=ResDia.jpg +File55=resdia20.png +File56=resumendia.jpg +File57=salma.jpg +File58=salma.png +File59=scrollpromos.bal File6=carrito.png -File60=scrollpromos.bal -File61=senial.jpg -File62=sync.png -File63=tache_rojo.png -File64=Ticket dia.jpg -File65=ticketdia20.jpg -File66=ticketdia20.png -File67=ticketsdia.bal -File68=Tiendita.jpg -File69=verde.png +File60=senial.jpg +File61=sync.png +File62=tache_rojo.png +File63=Ticket dia.jpg +File64=ticketdia20.jpg +File65=ticketdia20.png +File66=ticketsdia.bal +File67=Tiendita.jpg +File68=verde.png File7=celltitle.bal File8=cliente.bal File9=clientes.bal @@ -133,7 +132,6 @@ FileGroup65=Default Group FileGroup66=Default Group FileGroup67=Default Group FileGroup68=Default Group -FileGroup69=Default Group FileGroup7=Default Group FileGroup8=Default Group FileGroup9=Default Group @@ -171,7 +169,7 @@ Library6=byteconverter Library7=camera Library8=compressstrings Library9=contentresolver -ManifestCode='This code will be applied to the manifest file during compilation.~\n~'You do not need to modify it in most cases.~\n~'See this link for for more information: https://www.b4x.com/forum/showthread.php?p=78136~\n~AddManifestText(~\n~~\n~)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~CreateResourceFromFile(Macro, Themes.LightTheme)~\n~AddApplicationText(~\n~)~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~ 'End of default text.~\n~''''' CAMBIA LA CLAVE API~\n~AddApplicationText(~\n~~\n~ ~\n~)~\n~AddApplicationText(~\n~~\n~)~\n~AddManifestText(~\n~~\n~)~\n~''CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~ 'End of default text.~\n~ ~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~AddManifestText(~\n~~\n~)~\n~AddManifestText(~\n~~\n~)~\n~AddPermission(android.permission.ACCESS_BACKGROUND_LOCATION)~\n~AddManifestText(~\n~~\n~)~\n~AddManifestText(~\n~~\n~) 'in order to access the device non-resettable identifiers such as IMEI and serial number.~\n~~\n~'///////////////////////// FLP Y PUSH /////////////~\n~' CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~' CreateResourceFromFile(Macro, FirebaseAnalytics.Firebase)~\n~' CreateResourceFromFile(Macro, FirebaseAnalytics.FirebaseAnalytics)~\n~' CreateResourceFromFile(Macro, FirebaseNotifications.FirebaseNotifications)~\n~ SetServiceAttribute(Tracker, android:foregroundServiceType, "location")~\n~'//////////////////////////////////////////////////////~\n~~\n~'/////////////////////// App Updating ////////////////~\n~AddManifestText(~\n~ )~\n~AddApplicationText(~\n~ ~\n~ ~\n~ ~\n~ )~\n~CreateResource(xml, provider_paths,~\n~ ~\n~ ~\n~ ~\n~ ~\n~ ~\n~ )~\n~AddManifestText()~\n~AddManifestText()~\n~AddManifestText()~\n~AddManifestText()~\n~~\n~AddPermission(android.permission.REQUEST_INSTALL_PACKAGES)~\n~AddPermission(android.permission.INTERNET)~\n~AddPermission(android.permission.INSTALL_PACKAGES)~\n~AddPermission(android.permission.READ_EXTERNAL_STORAGE)~\n~AddPermission(android.permission.WRITE_EXTERNAL_STORAGE)~\n~AddPermission(android.permission.READ_PHONE_STATE)~\n~AddPermission(android.permission.WAKE_LOCK)~\n~CreateResourceFromFile(Macro, JhsIceZxing1.CaturePortrait)~\n~ ~\n~SetApplicationAttribute(android:largeHeap, "true")~\n~~\n~AddManifestText(~\n~ )~\n~AddApplicationText(~\n~ ~\n~ ~\n~ ~\n~)~\n~CreateResource(xml, provider_paths,~\n~~\n~ ~\n~ ~\n~ ~\n~~\n~)~\n~AddPermission(android.permission.REQUEST_INSTALL_PACKAGES)~\n~AddPermission(android.permission.INTERNET)~\n~AddPermission(android.permission.INSTALL_PACKAGES)~\n~AddPermission(android.permission.READ_EXTERNAL_STORAGE)~\n~AddPermission(android.permission.WRITE_EXTERNAL_STORAGE)~\n~AddPermission("android.permission.MANAGE_EXTERNAL_STORAGE")~\n~AddPermission(android.permission.READ_PHONE_STATE)~\n~AddPermission(android.permission.WAKE_LOCK)~\n~SetApplicationAttribute(android:allowBackup, "false")~\n~AddManifestText()~\n~AddApplicationText(~\n~~\n~ ~\n~ )~\n~AddPermission(android.permission.BLUETOOTH_ADVERTISE)~\n~AddPermission(android.permission.BLUETOOTH_CONNECT)~\n~AddPermission(android.permission.BLUETOOTH_SCAN)~\n~AddManifestText() +ManifestCode='This code will be applied to the manifest file during compilation.~\n~'You do not need to modify it in most cases.~\n~'See this link for for more information: https://www.b4x.com/forum/showthread.php?p=78136~\n~AddManifestText(~\n~~\n~)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~CreateResourceFromFile(Macro, Themes.LightTheme)~\n~AddApplicationText(~\n~)~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~ 'End of default text.~\n~''''' CAMBIA LA CLAVE API~\n~AddApplicationText(~\n~~\n~ ~\n~)~\n~AddApplicationText(~\n~~\n~)~\n~AddManifestText(~\n~~\n~)~\n~''CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~ 'End of default text.~\n~ ~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~AddManifestText(~\n~~\n~)~\n~AddManifestText(~\n~~\n~)~\n~AddPermission(android.permission.ACCESS_BACKGROUND_LOCATION)~\n~AddManifestText(~\n~~\n~)~\n~AddManifestText(~\n~~\n~) 'in order to access the device non-resettable identifiers such as IMEI and serial number.~\n~~\n~'///////////////////////// FLP Y PUSH /////////////~\n~' CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~' CreateResourceFromFile(Macro, FirebaseAnalytics.Firebase)~\n~' CreateResourceFromFile(Macro, FirebaseAnalytics.FirebaseAnalytics)~\n~' CreateResourceFromFile(Macro, FirebaseNotifications.FirebaseNotifications)~\n~ SetServiceAttribute(Tracker, android:foregroundServiceType, "location")~\n~'//////////////////////////////////////////////////////~\n~~\n~'/////////////////////// App Updating ////////////////~\n~AddManifestText(~\n~ )~\n~AddApplicationText(~\n~ ~\n~ ~\n~ ~\n~ )~\n~CreateResource(xml, provider_paths,~\n~ ~\n~ ~\n~ ~\n~ ~\n~ ~\n~ )~\n~AddManifestText()~\n~AddManifestText()~\n~AddManifestText()~\n~AddManifestText()~\n~~\n~AddPermission(android.permission.REQUEST_INSTALL_PACKAGES)~\n~AddPermission(android.permission.INTERNET)~\n~AddPermission(android.permission.INSTALL_PACKAGES)~\n~AddPermission(android.permission.READ_EXTERNAL_STORAGE)~\n~AddPermission(android.permission.WRITE_EXTERNAL_STORAGE)~\n~AddPermission(android.permission.READ_PHONE_STATE)~\n~AddPermission(android.permission.WAKE_LOCK)~\n~CreateResourceFromFile(Macro, JhsIceZxing1.CaturePortrait)~\n~ ~\n~SetApplicationAttribute(android:largeHeap, "true")~\n~~\n~AddManifestText(~\n~ )~\n~AddApplicationText(~\n~ ~\n~ ~\n~ ~\n~)~\n~CreateResource(xml, provider_paths,~\n~~\n~ ~\n~ ~\n~ ~\n~~\n~)~\n~AddPermission(android.permission.REQUEST_INSTALL_PACKAGES)~\n~AddPermission(android.permission.INTERNET)~\n~AddPermission(android.permission.INSTALL_PACKAGES)~\n~AddPermission(android.permission.READ_EXTERNAL_STORAGE)~\n~AddPermission(android.permission.WRITE_EXTERNAL_STORAGE)~\n~AddPermission("android.permission.MANAGE_EXTERNAL_STORAGE")~\n~AddPermission(android.permission.READ_PHONE_STATE)~\n~AddPermission(android.permission.WAKE_LOCK)~\n~SetApplicationAttribute(android:allowBackup, "false")~\n~AddManifestText()~\n~AddApplicationText(~\n~~\n~ ~\n~ )~\n~AddPermission(android.permission.BLUETOOTH_ADVERTISE)~\n~AddPermission(android.permission.BLUETOOTH_CONNECT)~\n~AddPermission(android.permission.BLUETOOTH_SCAN)~\n~AddManifestText()~\n~ Module1=appUpdater Module10=C_Nota Module11=C_NoVenta @@ -203,15 +201,15 @@ Module6=C_Clientes Module7=C_Cuestionario Module8=C_Historico Module9=C_Mapas -NumberOfFiles=69 +NumberOfFiles=68 NumberOfLibraries=33 NumberOfModules=31 -Version=13 +Version=12.8 @EndOfDesignText@ #Region Project Attributes #ApplicationLabel: mazapa #VersionCode: 1 - #VersionName: 5.01.15 + #VersionName: 5.05.21 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/MAZAPA.b4a.meta b/B4A/MAZAPA.b4a.meta index b3c62be..9e61c15 100644 --- a/B4A/MAZAPA.b4a.meta +++ b/B4A/MAZAPA.b4a.meta @@ -94,6 +94,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Subs,alcanzanLosVariablesParaPromo,1136,5,C_Principal,Class_Globals,0,0,C_Principal,connecta_Click,2117,0,Main,Activity_Create,28,0,C_Cliente,GPS_LocationChanged,516,1,C_Cliente,imprime_preventa,1264,2,C_Cliente,imprime_venta,1439,0,C_Cliente,B_IMP_Click,1194,0,EscPosPrinter,Serial1_Connected,1135,0,EscPosPrinter,WriteQRCode,1114,0 +NavigationStack=DiseƱador Visual,cliente.bal,-100,2,C_Bitacora,cargamosPanel,182,6,C_Cliente,b_cxc_Click,2477,0,C_Cliente,CreateListItem,2496,0,DiseƱador Visual,proditem.bal,-100,6,C_Productos,clv_prods_ll_VisibleRangeChanged,1144,3,C_Principal,Subir_Click,812,0,Starter,Service_Destroy,88,0,Main,Globals,24,0,B4XMainPage,et_buspc_TextChanged,966,0 SelectedBuild=0 -VisibleModules=29,1,14,2,12,3,6,7,8,26,5,22 +VisibleModules=29,1,2,14,5,12,6,7,8,15,4