diff --git a/B4A/ADM.b4a b/B4A/ADM.b4a index 7a9d3db..1d5b1f6 100644 --- a/B4A/ADM.b4a +++ b/B4A/ADM.b4a @@ -1121,7 +1121,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: ADM #VersionCode: 1 - #VersionName: 5.09.03 + #VersionName: 5.09.04 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/ADM.b4a.meta b/B4A/ADM.b4a.meta index 326b93e..b06bf16 100644 --- a/B4A/ADM.b4a.meta +++ b/B4A/ADM.b4a.meta @@ -97,6 +97,6 @@ ModuleClosedNodes6=3 ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_TicketsDia,b_guardaNoVenta_Click,300,1,C_TicketsDia,GPS_LocationChanged,218,0,C_TicketsDia,ListView1_ItemLongClick,213,0,Diseñador Visual,mapa_rutas.bal,-100,2,C_TicketsDia,b_noventa0_Click,229,0,MAPA_RUTAS,b_guardaNoVenta_Click,575,0,Diseñador Visual,clientes.bal,-100,3,C_Clientes,B4XPage_Appear,141,6,Diseñador Visual,datosclienteBotones.bal,-100,2,C_Clientes,CreateListItem,210,0,Starter,reinicializaReqManager,164,0 +NavigationStack=Subs,fechanormal,1574,0,C_NoVenta,CANCELA_Click,71,0,C_NoVenta,GUARDA_Click,77,0,C_Clientes,Class_Globals,49,0,C_TicketsDia,Class_Globals,35,0,MAPA_RUTAS,b_noVenta_Click,550,0,MAPA_RUTAS,Globals,71,0,C_Clientes,b_guardaNoVenta_Click,706,0,C_TicketsDia,b_guardaNoVenta_Click,288,0,MAPA_RUTAS,b_guardaNoVenta_Click,568,0 SelectedBuild=0 VisibleModules=30,2,14,5,6,19,31,27,18,32,8,11 diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 8f5de37..2977e3c 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -711,7 +711,7 @@ Sub JobDone(Job As HttpJob) p_validacion.Visible = False et_codigo.Text = "" If recarga = "0" Then - Subs.panelVisible(P_CIEGO,0,0) + Subs.panelVisible(p_ciego,0,0) Else If recarga = "1" Then Starter.skmt.ExecNonQuery("delete from CUENTAA") Starter.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object("1")) diff --git a/B4A/C_Clientes.bas b/B4A/C_Clientes.bas index b7cde98..2fcd6bd 100644 --- a/B4A/C_Clientes.bas +++ b/B4A/C_Clientes.bas @@ -53,6 +53,8 @@ Sub Class_Globals Private b_guardaNoVenta As Button Private p_botonesNoVenta As Panel Private et_comentarioNoVenta As EditText + Private r_opcion7 As RadioButton + Private r_opcion6 As RadioButton Private r_opcion5 As RadioButton Private r_opcion4 As RadioButton Private r_opcion3 As RadioButton @@ -710,13 +712,17 @@ Private Sub b_guardaNoVenta_Click If r_opcion1.Checked Then motivo = "CERRADO" Else If r_opcion2.Checked Then - motivo = "NO COMPRA" + motivo = "NO TIENE DINERO" Else If r_opcion3.Checked Then - motivo = "CON PRODUCTO" + motivo = "NO ABRE MAÑANA" Else If r_opcion4.Checked Then - motivo = "NO ESTA EL ENCARGADO" + motivo = "FALTA DE PRODUCTO" + Else If r_opcion5.Checked Then + motivo = "PROMOCION CON OTRO DISTRIBUIDOR" + Else If r_opcion6.Checked Then + motivo = "RECIBEN MUCHOS PROVEEDORES" Else - motivo = "CANCELACION" + motivo = "NO LE QUEDA EL DIA" End If Log("FOTOCERRADO: " & fotoCerrado) diff --git a/B4A/C_TicketsDia.bas b/B4A/C_TicketsDia.bas index c24cbee..6650679 100644 --- a/B4A/C_TicketsDia.bas +++ b/B4A/C_TicketsDia.bas @@ -33,6 +33,9 @@ Sub Class_Globals Private Panel5 As Panel Private et_comentarioNoVenta As EditText Private Label3 As Label + Private r_opcion7 As RadioButton + Private r_opcion6 As RadioButton + Private r_opcion5 As RadioButton Private r_opcion4 As RadioButton Private r_opcion3 As RadioButton Private r_opcion2 As RadioButton @@ -277,13 +280,17 @@ Private Sub b_guardaNoVenta_Click If r_opcion1.Checked Then motivo = "CERRADO" Else If r_opcion2.Checked Then - motivo = "NO COMPRA" + motivo = "NO TIENE DINERO" Else If r_opcion3.Checked Then - motivo = "CON PRODUCTO" + motivo = "NO ABRE MAÑANA" Else If r_opcion4.Checked Then - motivo = "NO ESTA EL ENCARGADO" + motivo = "FALTA DE PRODUCTO" + Else If r_opcion5.Checked Then + motivo = "PROMOCION CON OTRO DISTRIBUIDOR" + Else If r_opcion6.Checked Then + motivo = "RECIBEN MUCHOS PROVEEDORES" Else - motivo = "CANCELACION" + motivo = "NO LE QUEDA EL DIA" End If If motivo = "CERRADO" And fotoCerrado = "" Then nombreFoto = Subs.traeCliente & "_cerrado" diff --git a/B4A/Files/clientes.bal b/B4A/Files/clientes.bal index b4c5f87..6ea08bd 100644 Binary files a/B4A/Files/clientes.bal and b/B4A/Files/clientes.bal differ diff --git a/B4A/Files/mapa_rutas.bal b/B4A/Files/mapa_rutas.bal index c5eac80..c18ebc4 100644 Binary files a/B4A/Files/mapa_rutas.bal and b/B4A/Files/mapa_rutas.bal differ diff --git a/B4A/Files/ticketsdia.bal b/B4A/Files/ticketsdia.bal index 57b97ed..8bb2f88 100644 Binary files a/B4A/Files/ticketsdia.bal and b/B4A/Files/ticketsdia.bal differ diff --git a/B4A/MAPA_RUTAS.bas b/B4A/MAPA_RUTAS.bas index b4a2f1d..2e4870f 100644 --- a/B4A/MAPA_RUTAS.bas +++ b/B4A/MAPA_RUTAS.bas @@ -73,6 +73,8 @@ Sub Globals Private p_botonesNoVenta As Panel Private Panel5 As Panel Private et_comentarioNoVenta As EditText + Private r_opcion7 As RadioButton + Private r_opcion6 As RadioButton Private r_opcion5 As RadioButton Private r_opcion4 As RadioButton Private r_opcion3 As RadioButton @@ -559,13 +561,17 @@ Private Sub b_guardaNoVenta_Click If r_opcion1.Checked Then motivo = "CERRADO" Else If r_opcion2.Checked Then - motivo = "NO COMPRA" + motivo = "NO TIENE DINERO" Else If r_opcion3.Checked Then - motivo = "CON PRODUCTO" + motivo = "NO ABRE MAÑANA" Else If r_opcion4.Checked Then - motivo = "NO ESTA EL ENCARGADO" + motivo = "FALTA DE PRODUCTO" + Else If r_opcion5.Checked Then + motivo = "PROMOCION CON OTRO DISTRIBUIDOR" + Else If r_opcion6.Checked Then + motivo = "RECIBEN MUCHOS PROVEEDORES" Else - motivo = "CANCELACION" + motivo = "NO LE QUEDA EL DIA" End If If motivo = "CERRADO" And fotoCerrado = "" Then nombreFoto = Subs.traeCliente & "_cerrado"