diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 132b598..09e6cc2 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -534,8 +534,8 @@ Sub ImageView4_Click Label1 = ListView1.SingleLineLayout.Label Label1.TextSize = 20 Label1.TextColor = Colors.Black - If user.Text = "KMTS1" Then ListView1.AddSingleLine("http://10.0.0.205:1782") - ListView1.AddSingleLine("http://keymon.lat:1782") + If user.Text = "KMTS1" Then ListView1.AddSingleLine("http://10.0.0.205:1781") + ListView1.AddSingleLine("http://keymon.lat:1781") c=Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("SERVER")) c.Position =0 E_SERVER.text = c.GetString("CAT_VA_VALOR") diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 1511e05..d3e6d00 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -571,14 +571,15 @@ Sub B4XPage_Appear Else Cuestionario End If + Log(YA_IMPRIMIO2) If YA_IMPRIMIO2 = 0 Then Guardar.Visible = False Else Guardar.Visible = True End If ' If la_cuenta.text = "0" Then Guardar.Visible = True 'Abordo - 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. - + If sumatotal = 0 Then Guardar.Visible = True 'Si no hay venta entonces "Guardar" es visible. + 'l_total.Text = Null Or l_total.Text = "null" Or l_total.text = "0" 'Promo Especial ' If Logger Then LogColor($"Ultima actividad BD=${Subs.traeUltimaActividadBD}"$, Colors.Magenta) Dim mPromoEspecial As Map = revisaPromoEspecial @@ -1360,8 +1361,16 @@ Sub B_IMP2_Click ' Else ' sTotal2 = 0 ' End If + s=Starter.skmt.ExecQuery2("select sum(PE_CANT) as CANTIDAD, SUM(PE_COSTO_TOT) AS TOTAL FROM PEDIDO WHERE PE_CEDIS <> PE_PROID AND PE_TIPO = ? and substr(pe_pronombre,1,6) = ? AND PE_CLIENTE IN (Select CUENTA from cuentaa)", Array As String("VENTA","CAMBIO")) + s.Position = 0 + Private sTotal3 As Double + If s.GetString("TOTAL") <> Null And IsNumber(s.GetString("TOTAL")) Then + sTotal3 = s.GetString("TOTAL") + Else + sTotal3 = 0 + End If Printer1.WriteString(Printer1.REVERSE & "===============================" & CRLF) - Printer1.WriteString( Printer1.UNREVERSE & Printer1.BOLD & $"Sub Total Venta: $${NumberFormat2(sTotal2, 1, 2, 2, False)}"$ & CRLF) + Printer1.WriteString( Printer1.UNREVERSE & Printer1.BOLD & $"Sub Total Venta: $${NumberFormat2((sTotal2+sTotal3), 1, 2, 2, False)}"$ & CRLF) Private cantidad1 As String = "0" If s.GetString("CANTIDAD") <> Null And IsNumber(s.GetString("CANTIDAD")) Then cantidad1 = s.GetString("CANTIDAD") Printer1.WriteString( Printer1.UNREVERSE & Printer1.BOLD & "No. Productos: " & cantidad1 & CRLF) @@ -1399,14 +1408,6 @@ Sub B_IMP2_Click End If s.Close - s=Starter.skmt.ExecQuery2("select sum(PE_CANT) as CANTIDAD, SUM(PE_COSTO_TOT) AS TOTAL FROM PEDIDO WHERE PE_CEDIS <> PE_PROID AND PE_TIPO = ? and substr(pe_pronombre,1,6) = ? AND PE_CLIENTE IN (Select CUENTA from cuentaa)", Array As String("VENTA","CAMBIO")) - s.Position = 0 - Private sTotal3 As Double - If s.GetString("TOTAL") <> Null And IsNumber(s.GetString("TOTAL")) Then - sTotal3 = s.GetString("TOTAL") - Else - sTotal3 = 0 - End If Printer1.WriteString(Printer1.REVERSE & "===============================" & CRLF) Printer1.WriteString(Printer1.UNREVERSE & Printer1.BOLD & "Sub Total CAMBIOS: $" & NumberFormat2(sTotal3, 1, 2, 2, False) & CRLF) Private cantidad2 As String = "0" @@ -3096,7 +3097,7 @@ Private Sub b_geopass_Click Log(Starter.server) Dim cmd As DBCommand cmd.Initialize - cmd.Name = "select_geoPass" + cmd.Name = "select_geoPass2" cmd.Parameters = Array As Object(et_geopass.Text, Subs.traeAlmacen, Subs.traeRuta) reqManager.ExecuteQuery(cmd , 0, "traeGeoPass") Log($"${Starter.server}, ${et_geopass.Text}, ${Subs.traeAlmacen}, ${Subs.traeRuta}"$) diff --git a/B4A/Files/logo2.png b/B4A/Files/logo2.png index 6c8b479..21c707e 100644 Binary files a/B4A/Files/logo2.png and b/B4A/Files/logo2.png differ diff --git a/B4A/KelloggsV3.b4a b/B4A/KelloggsV3.b4a index ad91140..34b3de3 100644 --- a/B4A/KelloggsV3.b4a +++ b/B4A/KelloggsV3.b4a @@ -176,7 +176,7 @@ Version=12.5 #Region Project Attributes #ApplicationLabel: Kelloggs Venta #VersionCode: 3000 - #VersionName: 3.11.08 RMI + #VersionName: 3.11.09 RMI #SupportedOrientations: portrait #CanInstallToExternalStorage: False #BridgeLogger:true diff --git a/B4A/KelloggsV3.b4a.meta b/B4A/KelloggsV3.b4a.meta index 5d87e20..f4bc102 100644 --- a/B4A/KelloggsV3.b4a.meta +++ b/B4A/KelloggsV3.b4a.meta @@ -82,6 +82,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Nota,borra_Click,243,4,C_Nota,ListView1_ItemLongClick,283,6,C_Cliente,GPS_LocationChanged,760,0,C_Cliente,b_aceptarrpomo_Click,3007,6,C_Principal,cargar_Click,461,0,C_Principal,getTableColumnList,287,1,C_Principal,chkIfTableExists,279,1,B4XMainPage,b_findiaOk_Click,587,0,C_Principal,getTableColumnListName,285,1,C_Principal,B4XPage_Created,262,6,C_Principal,e_ruta_EnterPressed,2108,6 +NavigationStack=Starter,Process_Globals,29,0,C_Cliente,Class_Globals,4,0,C_Cliente,JobDone,3119,0,Diseñador Visual,principal.bal,-100,2,C_Cliente,b_geopass_Click,3078,0,C_Cliente,B4XPage_Appear,574,3,C_Productos,HACER_PEDIDO,576,0,C_Cliente,Mods,0,0,C_Cliente,b_mapa_Click,923,0,C_Cliente,B_IMP2_Click,1367,1 SelectedBuild=0 -VisibleModules=1,2,3,4,5,6,7,8,9,10,11,26,27 +VisibleModules=1,2,3,4,5,6,7,8,9,10,12 diff --git a/B4A/Starter.bas b/B4A/Starter.bas index fbac3f6..da97536 100644 --- a/B4A/Starter.bas +++ b/B4A/Starter.bas @@ -73,7 +73,7 @@ Sub Service_Create logcat.LogCatStart(Array As String("-v","raw","*:F","B4A:v"), "logcat") #end if logs.Initialize - server = "http://keymon.lat:1782" + server = "http://keymon.lat:1781" ' server = "http://10.0.0.205:1782" ' server = "http://11.0.0.29:1782" If Logger Then Log($"Starter reqManager server: ${server}"$)