diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 99fe138..4940d3d 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -403,10 +403,6 @@ End Sub 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage. Sub B4XPage_Appear - If kh.motivoNoVisitaActivo Then - ToastMessageShow("Ruta CERRADA por NO VISITA", True) - Subs.iniciaActividad("Principal") - End If indicePregunta = 0 b_noVenta.Enabled = False ' Log(kh.traeTotalCliente) @@ -456,7 +452,14 @@ Sub B4XPage_Appear Starter.GPS.Start(0, 0) If Starter.ubicacionActual.IsInitialized And Starter.ubicacionActual.Latitude <> 0 Then GPS_LocationChanged(Starter.ubicacionActual) End If - If muestraBoleta Then LLAMA_BOLETA + If muestraBoleta Then + LLAMA_BOLETA + Else + If kh.motivoNoVisitaActivo Then + ToastMessageShow("Ruta CERRADA por NO VISITA", True) + Subs.iniciaActividad("Principal") + End If + End If BT_QR.Enabled = False ' b_factura.Visible = False Panel_INV_A.Visible = False @@ -641,8 +644,10 @@ Sub B4XPage_Appear Else Guardar.Visible = True End If - If Not(l_total.Text > 0) And Not(kh.traeTotalClienteDOE > 0) Then Guardar.Visible = True + If l_total.Text = "" Or l_total.Text = "null" Then l_total.Text = "0" + If Not(l_total.Text > 0) Then Guardar.Visible = True ' And Not(kh.traeTotalClienteDOE > 0 ' If la_cuenta.text = "0" Then Guardar.Visible = True 'Abordo + Log($"L_TOTAL = ${l_total.text}"$) If l_total.Text = Null Or l_total.Text = "null" Or l_total.text = "0" Then Guardar.Visible = True 'Si no hay venta entonces "Guardar" es visible. 'Promo Especial @@ -703,30 +708,32 @@ Sub B4XPage_Appear gps_boton_doe = "0" C1=Starter.skmt.ExecQuery("select IMPRESION FROM kmt_info where CAT_CL_CODIGO In (select cuenta from cuentaa)") - C1.Position = 0 - If C1.GetString("IMPRESION") <> "1" Then - S=Starter.skmt.ExecQuery2("select COUNT(*) AS CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) AND PE_PROID = ?", Array As String("PROMODOE") ) - s.Position = 0 - If s.GetString("CUANTOS") = 0 Then - c=Starter.skmt.ExecQuery2("SELECT COUNT(*) AS CUANTOS FROM HIST_CLIENTE_CANT_PROMOS WHERE HCCP_CLIENTE IN (Select cuenta from cuentaa) AND HCCP_PROMO = ?", Array As String("PROMODOE")) - c.Position =0 - If c.GetString("CUANTOS") > 0 Then - C3=Starter.skmt.ExecQuery2("SELECT COUNT(*) AS CUANTOS FROM CAT_GUNAPROD2 WHERE CAT_GP_ID = ? ", Array As String("1008094223")) - C3.Position = 0 - If C3.GetString("CUANTOS") > 0 Then - c2=Starter.skmt.ExecQuery2("SELECT CAT_GP_ALMACEN FROM CAT_GUNAPROD2 WHERE CAT_GP_ID = ? ", Array As String("1008094223")) - c2.Position = 0 - If c2.GetString("CAT_GP_ALMACEN") > 0 Then - b_whats.Visible = False + If C1.RowCount > 0 Then + C1.Position = 0 + If C1.GetString("IMPRESION") <> "1" Then + S=Starter.skmt.ExecQuery2("select COUNT(*) AS CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) AND PE_PROID = ?", Array As String("PROMODOE") ) + s.Position = 0 + If s.GetString("CUANTOS") = 0 Then + c=Starter.skmt.ExecQuery2("SELECT COUNT(*) AS CUANTOS FROM HIST_CLIENTE_CANT_PROMOS WHERE HCCP_CLIENTE IN (Select cuenta from cuentaa) AND HCCP_PROMO = ?", Array As String("PROMODOE")) + c.Position =0 + If c.GetString("CUANTOS") > 0 Then + C3=Starter.skmt.ExecQuery2("SELECT COUNT(*) AS CUANTOS FROM CAT_GUNAPROD2 WHERE CAT_GP_ID = ? ", Array As String("1008094223")) + C3.Position = 0 + If C3.GetString("CUANTOS") > 0 Then + c2=Starter.skmt.ExecQuery2("SELECT CAT_GP_ALMACEN FROM CAT_GUNAPROD2 WHERE CAT_GP_ID = ? ", Array As String("1008094223")) + c2.Position = 0 + If c2.GetString("CAT_GP_ALMACEN") > 0 Then + b_whats.Visible = False ' gps_boton_doe = "1" + End If + c2.Close End If - c2.Close + C3.Close End If - C3.Close + c.Close End If - c.Close + s.Close End If - s.Close End If C1.Close gps_boton_doe = "0" @@ -977,7 +984,7 @@ Sub Guardar_Click b_inicioFinVenta.Visible = False Starter.enVenta = False LogColor(">>>>>> ABORDO: " & Starter.enVenta, Colors.red) - Subs.bitacora(Subs.fechanormal(DateTime.Now), usuario, Id_Almacen, ruta_tienda, "Venta Abordo", "0", "", Subs.fechanormal(DateTime.Now), Starter.lat_gps, Starter.lon_gps, precision, "", "") + Subs.bitacora(Subs.fechanormal(DateTime.Now), usuario, Id_Almacen, ruta_tienda, "Venta Abordo", "0", Subs.fechanormal(DateTime.Now), Subs.fechanormal(DateTime.Now), Starter.lat_gps, Starter.lon_gps, precision, "", "") Subs.iniciaActividad("principal") B4XPages.ShowPageAndRemovePreviousPages("Principal") End If diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index d2b6d03..fb7f9fc 100644 Binary files a/B4A/Files/principal.bal and b/B4A/Files/principal.bal differ diff --git a/B4A/KelloggsV4.b4a b/B4A/KelloggsV4.b4a index bfa304b..172e32f 100644 --- a/B4A/KelloggsV4.b4a +++ b/B4A/KelloggsV4.b4a @@ -887,7 +887,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Kelloggs Venta #VersionCode: 3000 - #VersionName: 4.06.26 + #VersionName: 4.06.27 #SupportedOrientations: portrait #CanInstallToExternalStorage: False #BridgeLogger:true diff --git a/B4A/KelloggsV4.b4a.meta b/B4A/KelloggsV4.b4a.meta index b7f050a..df90fb3 100644 --- a/B4A/KelloggsV4.b4a.meta +++ b/B4A/KelloggsV4.b4a.meta @@ -91,6 +91,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Subs,bitacora,1685,0,C_Principal,p_transparente2_Click,3570,0,C_Principal,b_motivoNoVisita_Click,3528,6,Visual Designer,principal.bal,-100,2,C_Principal,B4XPage_Appear,396,1,C_Principal,e_ruta_EnterPressed,2148,0,Main,Globals,24,0,Main,Process_Globals,22,0,C_Principal,b_reactivaRuta_Click,3593,6,C_Principal,b_noVisita_Click,3566,6,Subs,traeRuta,831,1 +NavigationStack=Subs,traeRuta,831,1,Subs,traeProdNombre,810,0,C_Principal,Class_Globals,1,0,kms_helperSubs,motivoNoVisitaActivo,1187,0,C_Cliente,B4XPage_CloseRequest,875,0,C_Principal,B_BOLETA_Click,2721,0,Visual Designer,principal.bal,-100,6,C_Cliente,LLAMA_BOLETA,2415,0,C_Cliente,B4XPage_Appear,436,6,Visual Designer,cliente.bal,-100,6,C_Cliente,Guardar_Click,980,0 SelectedBuild=0 VisibleModules=1,28,11,3,26,23,29,12,4,13