diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index fc5d2a7..5afb84c 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -704,7 +704,7 @@ End Sub Sub i_engrane_Click lv_server.Clear - lv_server.AddSingleLine("http://keymon.lat:1781") + lv_server.AddSingleLine("http://keymon.net:1781") If user.Text = "KMTS1" Then lv_server.AddSingleLine("http://11.0.0.89:1781") ' l_server.Text = Starter.DBReqServer et_server.Text = Starter.DBReqServer diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 9477b9d..747db4b 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -212,6 +212,33 @@ Sub B4XPage_Appear ToastMessageShow("Es necesario tener el GPS encendido", True) StartActivity(Starter.gps.LocationSettingsIntent) End If + +' DateTime.DateFormat = "MM/dd/yyyy" +' sDate=DateTime.Date(DateTime.Now) +' sTime=DateTime.Time(DateTime.Now) +' c=skmt.ExecQuery("Select CUENTA from cuentaa") +' c.Position=0 +' clie_id = c.GetString("CUENTA") +' c.Close +' c=skmt.ExecQuery("select USUARIO from usuarioa") +' c.Position=0 +' usuario = c.GetString("USUARIO") +' c.Close +' +' c = skmt.ExecQuery("Select sum(pe_costo_tot) As TOTAL_CLIE, SUM(PE_CANT) As CANT_CLIE, COUNT(*) As CUANTOS FROM PEDIDO Where PE_CLIENTE IN (Select cuenta from cuentaa)") +' c.Position=0 +' +' If c.GetString("CUANTOS") > 0 Then +' Private cbFactura As Int = 0 +' If cb_factura.Checked Then cbFactura = 1 +' skmt.ExecNonQuery("delete from NOVENTA where NV_CLIENTE In (select cuenta from cuentaa)") +' skmt.ExecNonQuery("delete from pedido_cliente where PC_CLIENTE In (select cuenta from cuentaa)") +' skmt.ExecNonQuery2("insert into pedido_cliente(PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT, PC_ENVIO_OK, PC_FACTURA, PC_SOLICITA) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object(clie_id, sDate & sTime, usuario, c.GetString("CANT_CLIE"), c.GetString("TOTAL_CLIE"), B4XPages.MainPage.lon_gps, B4XPages.MainPage.lat_gps, 0, cbFactura, et_Solicita.Text)) +' LogColor("------------!!!!"&et_Solicita.Text, Colors.Gray) +' skmt.ExecNonQuery("UPDATE kmt_info set gestion = 2 where CAT_CL_CODIGO In (select cuenta from cuentaa)") +' +' End If + cb_factura.Checked = False p_abono.Visible = False Subs.centraPanel(p_abono, Root.Width) @@ -364,6 +391,8 @@ Sub B4XPage_Appear cSol.Close End If + + End Sub Sub GPS_LocationChanged (Location1 As Location) @@ -388,7 +417,7 @@ Sub GPS_LocationChanged (Location1 As Location) distance = l1.DistanceTo(l2) 'the result is in meter gest.Visible = True ' Log(distance) - If distance < 3000000000000000000000000000000000000 Then + If distance < 3000000000000000000000000000000000 Then ' If distance < 30 Then Tels.Visible = True gest.Visible = True diff --git a/B4A/C_Pedidos.bas b/B4A/C_Pedidos.bas index eda746c..242a70f 100644 --- a/B4A/C_Pedidos.bas +++ b/B4A/C_Pedidos.bas @@ -454,7 +454,7 @@ Sub Terminar_Click End If e.Close Log(222) - Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_FOLIO) VALUES(?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (L_PROID.text,0 , 0, cantidad.text, l_desc.text, L_PROID.Text,clie_id, sDate & sTime, usuario,cl_ruta, b4xpages.MainPage.tipo_venta)) + Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_FOLIO) VALUES(?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (L_PROID.text,0 , 0, cantidad.text, l_desc.text, L_PROID.Text,clie_id, sDate & sTime, usuario,cl_ruta, B4XPages.MainPage.tipo_venta)) Starter.skmt.ExecNonQuery2("update cat_gunaprod set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object(cantidad.Text, L_PROID.Text)) Else Msgbox("Tiene " & TOT_ART_PROMO & " " & TOT_ART_PROMOR & " y necesita " & PROMO_C & " " & PROMO_CR & " Para la Promo. " , "ADVERTENCIA") 'ignore @@ -496,7 +496,7 @@ Sub Terminar_Click End If e.Close Log(444) - Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_FOLIO) VALUES(?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (L_PROID.text,0, 0, cantidad.text, l_desc.text, L_PROID.Text,clie_id, sDate & sTime, usuario,cl_ruta, b4xpages.MainPage.tipo_venta)) + Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_FOLIO) VALUES(?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (L_PROID.text,0, 0, cantidad.text, l_desc.text, L_PROID.Text,clie_id, sDate & sTime, usuario,cl_ruta, B4XPages.MainPage.tipo_venta)) Starter.skmt.ExecNonQuery2("update cat_gunaprod set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object(cantidad.Text, L_PROID.Text)) cantidad.Text = "" c=Starter.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, SUM(PE_COSTO_SIN) AS TOTAL_CLIE_SIN FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") @@ -521,7 +521,7 @@ Sub Terminar_Click c.Position=0 usuario = c.GetString("USUARIO") Log(555) - Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_COSTO_SIN,PE_FOLIO) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (ALMACEN,cantidad.Text * l_precio.Text, l_precio.text, cantidad.text, l_desc.text, L_PROID.Text,clie_id, sDate & sTime, usuario,cl_ruta,preciosin, b4xpages.MainPage.tipo_venta)) + Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO,PE_RUTA,PE_COSTO_SIN,PE_FOLIO) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (ALMACEN,cantidad.Text * l_precio.Text, l_precio.text, cantidad.text, l_desc.text, L_PROID.Text,clie_id, sDate & sTime, usuario,cl_ruta,preciosin, B4XPages.MainPage.tipo_venta)) Starter.skmt.ExecNonQuery2("update cat_gunaprod set cat_gp_almacen = cat_gp_almacen - ? where cat_gp_id = ? ", Array As Object(cantidad.Text, L_PROID.Text)) c=Starter.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, SUM(PE_COSTO_SIN) AS TOTAL_CLIE_SIN FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") c.Position=0 diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index c751ba1..f2e0260 100644 Binary files a/B4A/Files/principal.bal and b/B4A/Files/principal.bal differ diff --git a/B4A/Profina.b4a b/B4A/Profina.b4a index 2920e26..2e0b84d 100644 --- a/B4A/Profina.b4a +++ b/B4A/Profina.b4a @@ -1069,7 +1069,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Profina #VersionCode: 1 - #VersionName: 5.09.20 + #VersionName: 5.09.26 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/Profina.b4a.meta b/B4A/Profina.b4a.meta index 3a78f8f..9c0ec3a 100644 --- a/B4A/Profina.b4a.meta +++ b/B4A/Profina.b4a.meta @@ -82,6 +82,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=MAPA_RUTAS,MapFragment1_Ready,143,2,appUpdater,download_newApk,158,0,B4XMainPage,B4XPage_Created,172,0,Diseñador Visual,login.bal,-100,2,C_Principal,Class_Globals,226,0,C_Cliente,GPS_LocationChanged,373,0,C_Principal,connecta_Click,1831,0,C_Principal,JobDone,1702,6,C_Principal,B4XPage_Created,276,0,C_Principal,B4XPage_Appear,420,6 +NavigationStack=C_Subs,borraPedidoClienteActual,596,0,C_TicketsDia,B4XPage_Created,29,0,Subs,guardaProducto,759,0,Subs,guardaProductoSinGestion,774,0,Subs,borraPedidoClienteActual,1241,0,C_Nota,B4XPage_Appear,95,0,C_Nota,borra_Click,136,0,C_Nota,ListView1_ItemLongClick,178,0,C_Nota,b_desc_Click,228,0,C_NoVenta,GUARDA_Click,96,0,C_Pedidos,guardar_Click,326,0 SelectedBuild=0 -VisibleModules=1,2,3,12,4,5,6,7,8,9,23 +VisibleModules=1,2,3,12,4,5,6,7,8,9,25,23,13,26,11,16,17 diff --git a/B4A/Starter.bas b/B4A/Starter.bas index de8b89d..fd47fbc 100644 --- a/B4A/Starter.bas +++ b/B4A/Starter.bas @@ -23,7 +23,7 @@ Sub Process_Globals ' Dim DBReqServer As String = "http://11.0.0.253:1782" ' Dim DBReqServer As String = "http://187.189.244.154:1781" ' Dim DBReqServer As String = "http://10.0.0.205:1782" - Dim DBReqServer As String = "http://187.189.244.154:1781" + Dim DBReqServer As String = "http://keymon.net:1781" Dim Timer1 As Timer Dim Interval As Int = 300 Dim ruta As String = File.DirInternal