diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 40119ff..03aa225 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -154,6 +154,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("SERVER",Starter.skmt)) End If Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_ENCUESTA (HE_CLIE TEXT, HE_RES TEXT, HE_FECHA TEXT, HE_TIPO TEXT)") + Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_ENCUESTA4 (HE_CLIE TEXT, HE_RES TEXT, HE_FECHA TEXT, HE_TIPO TEXT, HE_ORDEN)") Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_ENCUESTA3 (HE_CLIE TEXT, HE_TIPO TEXT)") Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_ENCUESTA2 (HE_CLIE TEXT, HE_RES TEXT, HE_FECHA TEXT, HE_TIPO TEXT, HE_PRECIO TEXT)") Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_ENCUESTA_PREGUNTA (CAT_EP_ID TEXT,CAT_EP_IDTIPOPREGUNTA TEXT,CAT_CE_DESCRIPCION TEXT,CAT_EP_PREGUNTA TEXT,CAT_EP_RES1_PRED TEXT,CAT_EP_RES2_PRED TEXT,CAT_EP_RES3_PRED TEXT,CAT_EP_ORDEN_PREGUNTA TEXT)") diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 614138e..235eb99 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -205,7 +205,6 @@ Private Sub B4XPage_Created (Root1 As B4XView) End Sub Sub B4XPage_Appear - c = Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("MACIMP")) If c.RowCount > 0 Then c.Position = 0 @@ -301,11 +300,14 @@ Sub B4XPage_Appear End If If Printer1.IsConnected = False Then - Printer1.Connect +' Printer1.Connect + Log("1") Else Printer1.DisConnect Printer1.Connect + Log("2") End If +' Printer1.DisConnect If PASA_IMP = "1" Then B_IMP.Enabled = True End If @@ -360,7 +362,6 @@ End If Next End If End If - Printer1.DisConnect End Sub Sub GPS_LocationChanged (Location1 As Location) @@ -380,66 +381,66 @@ Sub ListView1_ItemLongClick (Position As Int, Value As Object) End Sub Sub gest_Click - If la_cuenta.Text <> "0" Then -' 1=1 ----> si no esta en el historico que se descargue del web ver si esta contestada de manera local - c2 = Starter.skmt.ExecQuery2("SELECT HE_CLIE FROM HIST_ENCUESTA3 WHERE HE_TIPO = ? AND HE_CLIE IN (SELECT CUENTA FROM CUENTAA) ",Array As String("K001")) - If c2.RowCount = 0 Then -' 2=2 ----> si no esta en el historico local mostrar encuesta - c = Starter.skmt.ExecQuery("SELECT DISTINCT HE_CLIE FROM HIST_ENCUESTA WHERE HE_CLIE IN(SELECT CUENTA FROM CUENTAA)") - If c.RowCount = 0 Then - b_factura.Visible = False - B_EXIBI.Visible = False - HIST.Visible = False - Tar.Visible = False - Tels.Visible = False - B_VENTA.Visible = False - B_IMP.Visible = False - gest.Visible = False - B_IMP2.Visible = False - B_INV.Visible = False - Guardar.Visible = False - sv_encuesta.Visible = True - sv_encuesta.Height = Root.Height - sv_encuesta.Width = Root.Width - sv_encuesta.Panel.LoadLayout("encuesta") - sv_encuesta.Panel.Height = p_encuestas.Height - p_encuestas.Width = Root.Width - - Dim items As List - items.Initialize - items.Add("Selecciona una opción") - items.Add("ESQUINA") - items.Add("CALLE") - items.Add("AVENIDA") - cb_pregunta1.SetItems(items) - itemselect = "Selecciona una opción" - - Dim items2 As List - items2.Initialize - items2.Add("Selecciona una opción") - items2.Add("1 persona") - items2.Add("2 personas") - items2.Add("Mas de 2 personas") - cb_pregunta8.SetItems(items2) - itemselect2 = "Selecciona una opción" - - bandera = 2 - Else - Starter.tipov = "PREVENTA" - B4XPages.ShowPage("Productos") - End If - Else - Starter.tipov = "PREVENTA" - B4XPages.ShowPage("Productos") - End If - Else If la_cuenta.Text = "0" Then - Starter.tipov = "PREVENTA" - B4XPages.ShowPage("Productos") - End If -' Starter.tipov = "PREVENTA" -' B4XPages.ShowPage("Productos") -'' StartActivity(colonia2) -' cuestionario +' If la_cuenta.Text <> "0" Then +'' 1=1 ----> si no esta en el historico que se descargue del web ver si esta contestada de manera local +' c2 = Starter.skmt.ExecQuery2("SELECT HE_CLIE FROM HIST_ENCUESTA3 WHERE HE_TIPO = ? AND HE_CLIE IN (SELECT CUENTA FROM CUENTAA) ",Array As String("K001")) +' If c2.RowCount = 0 Then +'' 2=2 ----> si no esta en el historico local mostrar encuesta +' c = Starter.skmt.ExecQuery("SELECT DISTINCT HE_CLIE FROM HIST_ENCUESTA4 WHERE HE_CLIE IN(SELECT CUENTA FROM CUENTAA)") +' If c.RowCount = 0 Then +' b_factura.Visible = False +' B_EXIBI.Visible = False +' HIST.Visible = False +' Tar.Visible = False +' Tels.Visible = False +' B_VENTA.Visible = False +' B_IMP.Visible = False +' gest.Visible = False +' B_IMP2.Visible = False +' B_INV.Visible = False +' Guardar.Visible = False +' sv_encuesta.Visible = True +' sv_encuesta.Height = Root.Height +' sv_encuesta.Width = Root.Width +' sv_encuesta.Panel.LoadLayout("encuesta") +' sv_encuesta.Panel.Height = p_encuestas.Height +' p_encuestas.Width = Root.Width +' +' Dim items As List +' items.Initialize +' items.Add("Selecciona una opción") +' items.Add("ESQUINA") +' items.Add("CALLE") +' items.Add("AVENIDA") +' cb_pregunta1.SetItems(items) +' itemselect = "Selecciona una opción" +' +' Dim items2 As List +' items2.Initialize +' items2.Add("Selecciona una opción") +' items2.Add("1 persona") +' items2.Add("2 personas") +' items2.Add("Mas de 2 personas") +' cb_pregunta8.SetItems(items2) +' itemselect2 = "Selecciona una opción" +' +' bandera = 2 +' Else +' Starter.tipov = "PREVENTA" +' B4XPages.ShowPage("Productos") +' End If +' Else +' Starter.tipov = "PREVENTA" +' B4XPages.ShowPage("Productos") +' End If +' Else If la_cuenta.Text = "0" Then +' Starter.tipov = "PREVENTA" +' B4XPages.ShowPage("Productos") +' End If + Starter.tipov = "PREVENTA" + B4XPages.ShowPage("Productos") +' StartActivity(colonia2) + cuestionario End Sub Sub Tels_Click @@ -595,8 +596,8 @@ Sub B_IMP_Click Sleep(1000) Log("++++++ " & cont) cont = cont + 1 - If cont = 7 Then Printer1.Connect 'Tratamos de reconectar - If cont > 15 Then impresoraConectada = True + If cont = 2 Then Printer1.Connect 'Tratamos de reconectar + If cont > 3 Then impresoraConectada = True Loop Sleep(500) impresoraConectada = False @@ -609,7 +610,7 @@ Sub B_IMP_Click Log("****** " & cont) cont = cont + 1 If cont = 2 Then Printer1.Connect - If cont > 4 Then impresoraConectada = True + If cont > 3 Then impresoraConectada = True Loop Sleep(500) impresoraConectada = False @@ -788,7 +789,7 @@ Sub B_IMP_Click ' End If Printer1.WriteString("Total Preventa: $" & s.GetString("TOTAL") & CRLF) s.Close - c=Starter.skmt.ExecQuery("select sum(PE_CANT) as PC_NOART from PEDIDO where PE_CLIENTE in (Select CUENTA from cuentaa) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP )") + c=Starter.skmt.ExecQuery("select sum(PE_CANT) as PC_NOART from PEDIDO where PE_CLIENTE in (Select CUENTA from cuentaa) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP ) and PE_TIPO = 'PREVENTA'") C.Position=0 Printer1.WriteString("Total Articulos: " & c.GetString("PC_NOART") & CRLF) c.Close @@ -850,8 +851,8 @@ Sub B_IMP2_Click ' Log("conectando ...") Sleep(1000) cont = cont + 1 - If cont = 3 Then Printer1.Connect 'Tratamos de reconectar - If cont > 15 Then impresoraConectada = True + If cont = 2 Then Printer1.Connect 'Tratamos de reconectar + If cont > 3 Then impresoraConectada = True Loop Sleep(500) impresoraConectada = False @@ -864,7 +865,7 @@ Sub B_IMP2_Click Sleep(1000) cont = cont + 1 If cont = 2 Then Printer1.Connect - If cont > 4 Then impresoraConectada = True + If cont > 3 Then impresoraConectada = True Loop Sleep(500) impresoraConectada = False @@ -1009,7 +1010,7 @@ Sub B_IMP2_Click s.Position =0 Printer1.WriteString("Total entrega: $" & s.GetString("TOTAL") & CRLF) s.Close - c=Starter.skmt.ExecQuery("select sum(PE_CANT) as PC_NOART from PEDIDO where PE_CLIENTE in (Select CUENTA from cuentaa) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP )") + c=Starter.skmt.ExecQuery("select sum(PE_CANT) as PC_NOART from PEDIDO where PE_CLIENTE in (Select CUENTA from cuentaa) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP ) and PE_TIPO = 'PREVENTA' ") C.Position=0 Printer1.WriteString("Total Articulos: " & c.GetString("PC_NOART") & CRLF) c.Close @@ -1171,66 +1172,67 @@ Sub B_INV_Click End Sub Sub B_VENTA_Click - If la_cuenta.Text <> "0" Then - c2 = Starter.skmt.ExecQuery2("SELECT HE_CLIE FROM HIST_ENCUESTA3 WHERE HE_TIPO = ? AND HE_CLIE IN (SELECT CUENTA FROM CUENTAA) ",Array As String("K001")) - If c.RowCount = 0 Then -' 2=2 ----> si no esta en el historico local mostrar encuesta - c = Starter.skmt.ExecQuery("SELECT DISTINCT HE_CLIE FROM HIST_ENCUESTA WHERE HE_CLIE IN(SELECT CUENTA FROM CUENTAA)") - If c.RowCount = 0 Then - b_factura.Visible = False - B_EXIBI.Visible = False - HIST.Visible = False - Tar.Visible = False - Tels.Visible = False - B_VENTA.Visible = False - B_IMP.Visible = False - gest.Visible = False - B_IMP2.Visible = False - B_INV.Visible = False - Guardar.Visible = False - sv_encuesta.Visible = True - sv_encuesta.Height = Root.Height - sv_encuesta.Width = Root.Width - sv_encuesta.Panel.LoadLayout("encuesta") - sv_encuesta.Panel.Height = p_encuestas.Height - p_encuestas.Width = Root.Width - - Dim items As List - items.Initialize - items.Add("Selecciona una opción") - items.Add("ESQUINA") - items.Add("CALLE") - items.Add("AVENIDA") - cb_pregunta1.SetItems(items) - itemselect = "Selecciona una opción" - - Dim items2 As List - items2.Initialize - items2.Add("Selecciona una opción") - items2.Add("1 persona") - items2.Add("2 personas") - items2.Add("Mas de 2 personas") - cb_pregunta8.SetItems(items2) - itemselect2 = "Selecciona una opción" - - bandera = 1 - Else - Starter.tipov = "VENTA" - B4XPages.ShowPage("Productos") - End If - Else - Starter.tipov = "VENTA" - B4XPages.ShowPage("Productos") - End If - Else If la_cuenta.Text = "0" Then - Starter.tipov = "VENTA" - B4XPages.ShowPage("Productos") - End If - -' Starter.tipov = "VENTA" -' 'StartActivity(colonia2) -' B4XPages.ShowPage("Productos") -' cuestionario +' If la_cuenta.Text <> "0" Then +'' 1=1 ----> si no esta en el historico que se descargue del web ver si esta contestada de manera local +' c2 = Starter.skmt.ExecQuery2("SELECT HE_CLIE FROM HIST_ENCUESTA3 WHERE HE_TIPO = ? AND HE_CLIE IN (SELECT CUENTA FROM CUENTAA) ",Array As String("K001")) +' If c2.RowCount = 0 Then +'' 2=2 ----> si no esta en el historico local mostrar encuesta +' c = Starter.skmt.ExecQuery("SELECT DISTINCT HE_CLIE FROM HIST_ENCUESTA4 WHERE HE_CLIE IN(SELECT CUENTA FROM CUENTAA)") +' If c.RowCount = 0 Then +' b_factura.Visible = False +' B_EXIBI.Visible = False +' HIST.Visible = False +' Tar.Visible = False +' Tels.Visible = False +' B_VENTA.Visible = False +' B_IMP.Visible = False +' gest.Visible = False +' B_IMP2.Visible = False +' B_INV.Visible = False +' Guardar.Visible = False +' sv_encuesta.Visible = True +' sv_encuesta.Height = Root.Height +' sv_encuesta.Width = Root.Width +' sv_encuesta.Panel.LoadLayout("encuesta") +' sv_encuesta.Panel.Height = p_encuestas.Height +' p_encuestas.Width = Root.Width +' +' Dim items As List +' items.Initialize +' items.Add("Selecciona una opción") +' items.Add("ESQUINA") +' items.Add("CALLE") +' items.Add("AVENIDA") +' cb_pregunta1.SetItems(items) +' itemselect = "Selecciona una opción" +' +' Dim items2 As List +' items2.Initialize +' items2.Add("Selecciona una opción") +' items2.Add("1 persona") +' items2.Add("2 personas") +' items2.Add("Mas de 2 personas") +' cb_pregunta8.SetItems(items2) +' itemselect2 = "Selecciona una opción" +' +' bandera = 1 +' Else +' Starter.tipov = "VENTA" +' B4XPages.ShowPage("Productos") +' End If +' Else +' Starter.tipov = "VENTA" +' B4XPages.ShowPage("Productos") +' End If +' Else If la_cuenta.Text = "0" Then +' Starter.tipov = "VENTA" +' B4XPages.ShowPage("Productos") +' End If +' + Starter.tipov = "VENTA" + 'StartActivity(colonia2) + B4XPages.ShowPage("Productos") + cuestionario End Sub Sub b_factura_Click @@ -1330,11 +1332,13 @@ End Sub Sub Printer1_Connected (Success As Boolean) Log("Impresora conectada.") If Success Then + Log("aqui estoy 1") ToastMessageShow("Connected successfully", False) Starter.skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("MACIMP")) Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("MACIMP", Starter.mac_impresora)) B_IMP.Enabled = True - impresoraConectada = True + impresoraConectada = False +' Printer1.DisConnect Else ' Msgbox(Printer1.ConnectedErrorMsg, "Error connecting.") ' If Msgbox2("", "Printer Error","Reprint","Cancel","",Null) = DialogResponse.POSITIVE Then 'ignore @@ -1529,7 +1533,7 @@ Private Sub b_guadaenc_Click sTime=DateTime.Time(DateTime.Now) c = Starter.skmt.ExecQuery("SELECT CUENTA FROM CUENTAA") c.Position = 0 - Starter.skmt.ExecNonQuery2("INSERT INTO HIST_ENCUESTA VALUES(?,?,?,?) ",Array As String(c.GetString("CUENTA"),itemselect,sDate&" "&sTime,2 )) + Starter.skmt.ExecNonQuery2("INSERT INTO HIST_ENCUESTA4 VALUES(?,?,?,?,?) ",Array As String(c.GetString("CUENTA"),itemselect,sDate&" "&sTime,2,1 )) c.Close If et_pregunta2.Text <> "" Then DateTime.DateFormat = "MM/dd/yyyy" @@ -1538,7 +1542,7 @@ Private Sub b_guadaenc_Click sTime=DateTime.Time(DateTime.Now) c = Starter.skmt.ExecQuery("SELECT CUENTA FROM CUENTAA") c.Position = 0 - Starter.skmt.ExecNonQuery2("INSERT INTO HIST_ENCUESTA VALUES(?,?,?,?) ",Array As String(c.GetString("CUENTA"),et_pregunta2.Text,sDate&" "&sTime,1 )) + Starter.skmt.ExecNonQuery2("INSERT INTO HIST_ENCUESTA4 VALUES(?,?,?,?,?) ",Array As String(c.GetString("CUENTA"),et_pregunta2.Text,sDate&" "&sTime,1,2 )) c.Close If et_pregunta3.Text <> "" Then DateTime.DateFormat = "MM/dd/yyyy" @@ -1547,7 +1551,7 @@ Private Sub b_guadaenc_Click sTime=DateTime.Time(DateTime.Now) c = Starter.skmt.ExecQuery("SELECT CUENTA FROM CUENTAA") c.Position = 0 - Starter.skmt.ExecNonQuery2("INSERT INTO HIST_ENCUESTA VALUES(?,?,?,?) ",Array As String(c.GetString("CUENTA"),et_pregunta3.Text,sDate&" "&sTime,1 )) + Starter.skmt.ExecNonQuery2("INSERT INTO HIST_ENCUESTA4 VALUES(?,?,?,?,?) ",Array As String(c.GetString("CUENTA"),et_pregunta3.Text,sDate&" "&sTime,1 ,3)) c.Close If et_pregunta4.Text <> "" Then DateTime.DateFormat = "MM/dd/yyyy" @@ -1556,7 +1560,7 @@ Private Sub b_guadaenc_Click sTime=DateTime.Time(DateTime.Now) c = Starter.skmt.ExecQuery("SELECT CUENTA FROM CUENTAA") c.Position = 0 - Starter.skmt.ExecNonQuery2("INSERT INTO HIST_ENCUESTA VALUES(?,?,?,?) ",Array As String(c.GetString("CUENTA"),et_pregunta4.Text,sDate&" "&sTime,1 )) + Starter.skmt.ExecNonQuery2("INSERT INTO HIST_ENCUESTA4 VALUES(?,?,?,?,?) ",Array As String(c.GetString("CUENTA"),et_pregunta4.Text,sDate&" "&sTime,1,4 )) c.Close If et_pregunta5.Text <> "" Then DateTime.DateFormat = "MM/dd/yyyy" @@ -1565,7 +1569,7 @@ Private Sub b_guadaenc_Click sTime=DateTime.Time(DateTime.Now) c = Starter.skmt.ExecQuery("SELECT CUENTA FROM CUENTAA") c.Position = 0 - Starter.skmt.ExecNonQuery2("INSERT INTO HIST_ENCUESTA VALUES(?,?,?,?) ",Array As String(c.GetString("CUENTA"),et_pregunta5.Text,sDate&" "&sTime,1 )) + Starter.skmt.ExecNonQuery2("INSERT INTO HIST_ENCUESTA4 VALUES(?,?,?,?,?) ",Array As String(c.GetString("CUENTA"),et_pregunta5.Text,sDate&" "&sTime,1,5 )) c.Close If et_pregunta6.Text <> "" Then DateTime.DateFormat = "MM/dd/yyyy" @@ -1574,7 +1578,7 @@ Private Sub b_guadaenc_Click sTime=DateTime.Time(DateTime.Now) c = Starter.skmt.ExecQuery("SELECT CUENTA FROM CUENTAA") c.Position = 0 - Starter.skmt.ExecNonQuery2("INSERT INTO HIST_ENCUESTA VALUES(?,?,?,?) ",Array As String(c.GetString("CUENTA"),et_pregunta6.Text,sDate&" "&sTime,1 )) + Starter.skmt.ExecNonQuery2("INSERT INTO HIST_ENCUESTA4 VALUES(?,?,?,?,?) ",Array As String(c.GetString("CUENTA"),et_pregunta6.Text,sDate&" "&sTime,1 ,6)) c.Close If rb_p7no.Checked = True Or rb_p7si.Checked = True Then DateTime.DateFormat = "MM/dd/yyyy" @@ -1583,7 +1587,7 @@ Private Sub b_guadaenc_Click sTime=DateTime.Time(DateTime.Now) c = Starter.skmt.ExecQuery("SELECT CUENTA FROM CUENTAA") c.Position = 0 - Starter.skmt.ExecNonQuery2("INSERT INTO HIST_ENCUESTA VALUES(?,?,?,?) ",Array As String(c.GetString("CUENTA"),pregunta7,sDate&" "&sTime,1 )) + Starter.skmt.ExecNonQuery2("INSERT INTO HIST_ENCUESTA4 VALUES(?,?,?,?,?) ",Array As String(c.GetString("CUENTA"),pregunta7,sDate&" "&sTime,3,7 )) c.Close If itemselect2 <> "Selecciona una opción" Then DateTime.DateFormat = "MM/dd/yyyy" @@ -1592,7 +1596,7 @@ Private Sub b_guadaenc_Click sTime=DateTime.Time(DateTime.Now) c = Starter.skmt.ExecQuery("SELECT CUENTA FROM CUENTAA") c.Position = 0 - Starter.skmt.ExecNonQuery2("INSERT INTO HIST_ENCUESTA VALUES(?,?,?,?) ",Array As String(c.GetString("CUENTA"),itemselect2,sDate&" "&sTime,2 )) + Starter.skmt.ExecNonQuery2("INSERT INTO HIST_ENCUESTA4 VALUES(?,?,?,?,?) ",Array As String(c.GetString("CUENTA"),itemselect2,sDate&" "&sTime,2,8 )) c.Close If bandera = 1 Then diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 805471e..512f8ec 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -621,7 +621,7 @@ Sub Subir_Click c.Close End If - c=skmt.ExecQuery("SELECT HE_CLIE, HE_RES, HE_FECHA, HE_TIPO FROM HIST_ENCUESTA") + c=skmt.ExecQuery("SELECT HE_CLIE, HE_RES, HE_FECHA, HE_TIPO, HE_ORDEN FROM HIST_ENCUESTA4") ' S_CP.Text = "Envio Encuesta" PB2.Progress = 1 If c.RowCount>0 Then @@ -630,7 +630,7 @@ Sub Subir_Click Dim cmd As DBCommand cmd.Initialize cmd.Name = "INSERT_ENCUESTA_K001DUR" - cmd.Parameters = Array As Object(C.GetString("HE_CLIE"),C.GetString("HE_RES"),C.GetString("HE_FECHA"),"1",ALMACEN,l_ruta.text,"1", C.GetString("HE_TIPO")) + cmd.Parameters = Array As Object(C.GetString("HE_CLIE"),C.GetString("HE_RES"),C.GetString("HE_FECHA"),C.GetString("HE_ORDEN"),ALMACEN,l_ruta.text,"1", C.GetString("HE_TIPO")) reqManager.ExecuteQuery(cmd , 0,"INS_K001") Next @@ -2020,6 +2020,7 @@ Sub e_ruta_EnterPressed skmt.ExecNonQuery("delete from HIST_VENTAS") skmt.ExecNonQuery("delete from HIST_VERIFICACION") skmt.ExecNonQuery("delete from HIST_ENCUESTA") + skmt.ExecNonQuery("delete from HIST_ENCUESTA4") skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("NUMERO_PEDIDO")) skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("NUMERO_PEDIDO",0)) diff --git a/B4A/Durakelo.b4a b/B4A/Durakelo.b4a index 8d70b5f..c793db5 100644 --- a/B4A/Durakelo.b4a +++ b/B4A/Durakelo.b4a @@ -765,7 +765,7 @@ Library6=camera Library7=compressstrings Library8=contentresolver Library9=core -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~'End of default text.~\n~~\n~AddApplicationText(~\n~~\n~~\n~)~\n~AddManifestText()~\n~AddManifestText()~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~~\n~~\n~'/////////////// FLP y FBMessageing MOD Inicia /////////////////////~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.Firebase)~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.FirebaseAnalytics)~\n~CreateResourceFromFile(Macro, FirebaseNotifications.FirebaseNotifications)~\n~'CreateResourceFromFile(Macro, FirebaseAnalytics.Crashlytics)~\n~SetServiceAttribute(Tracker, android:foregroundServiceType, "location")~\n~'/////////////// FLP y FBMessageing MOD Termina /////////////////////~\n~~\n~'Si al cargar un mapa de google manda este error "java.lang.NoClassDefFoundError: Failed resolution of: Lorg/apache/http/ProtocolVersion". agregar la siguiente linea:~\n~AddApplicationText()~\n~SetApplicationAttribute(android:allowBackup, "false")~\n~SetApplicationAttribute(android:exported, "true")~\n~AddManifestText()~\n~~\n~'Para provider (Envio de base de datos por whatsapp)~\n~AddApplicationText(~\n~ ~\n~ ~\n~ ~\n~ )~\n~CreateResource(xml, provider_paths,~\n~ ~\n~ ~\n~ ~\n~ ~\n~ ~\n~ )~\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.READ_PHONE_STATE)~\n~ AddPermission(android.permission.WAKE_LOCK)~\n~ ~\n~ ~\n~ AddPermission(android.permission.ACCESS_FINE_LOCATION)~\n~AddPermission(android.permission.BLUETOOTH_ADVERTISE)~\n~AddPermission(android.permission.BLUETOOTH_CONNECT)~\n~AddPermission(android.permission.BLUETOOTH_SCAN) +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~'End of default text.~\n~~\n~AddApplicationText(~\n~~\n~~\n~)~\n~AddManifestText()~\n~AddManifestText()~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~~\n~AddPermission(android.permission.ACCESS_FINE_LOCATION)~\n~AddPermission(android.permission.BLUETOOTH_ADVERTISE)~\n~AddPermission(android.permission.BLUETOOTH_CONNECT)~\n~AddPermission(android.permission.BLUETOOTH_SCAN)~\n~~\n~'/////////////// FLP y FBMessageing MOD Inicia /////////////////////~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.Firebase)~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.FirebaseAnalytics)~\n~CreateResourceFromFile(Macro, FirebaseNotifications.FirebaseNotifications)~\n~'CreateResourceFromFile(Macro, FirebaseAnalytics.Crashlytics)~\n~SetServiceAttribute(Tracker, android:foregroundServiceType, "location")~\n~'/////////////// FLP y FBMessageing MOD Termina /////////////////////~\n~~\n~'Si al cargar un mapa de google manda este error "java.lang.NoClassDefFoundError: Failed resolution of: Lorg/apache/http/ProtocolVersion". agregar la siguiente linea:~\n~AddApplicationText()~\n~SetApplicationAttribute(android:allowBackup, "false")~\n~SetApplicationAttribute(android:exported, "true")~\n~AddManifestText()~\n~~\n~'Para provider (Envio de base de datos por whatsapp)~\n~AddApplicationText(~\n~ ~\n~ ~\n~ ~\n~ )~\n~CreateResource(xml, provider_paths,~\n~ ~\n~ ~\n~ ~\n~ ~\n~ ~\n~ )~\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.READ_PHONE_STATE)~\n~ AddPermission(android.permission.WAKE_LOCK)~\n~ ~\n~ ~\n~ Module1=appUpdater Module10=C_Productos Module11=C_Promos @@ -797,7 +797,7 @@ Version=12.5 #Region Project Attributes #ApplicationLabel: Durakelo #VersionCode: 1 - #VersionName: 4.01.18_5 + #VersionName: 4.01.23_1 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/Durakelo.b4a.meta b/B4A/Durakelo.b4a.meta index 80307c6..7b66c77 100644 --- a/B4A/Durakelo.b4a.meta +++ b/B4A/Durakelo.b4a.meta @@ -48,7 +48,7 @@ ModuleBreakpoints8= ModuleBreakpoints9= ModuleClosedNodes0= ModuleClosedNodes1= -ModuleClosedNodes10=1,3,7,35,36,37,38,39,40,41,42 +ModuleClosedNodes10=1,7,35,36,37,38,39,40,41,42 ModuleClosedNodes11= ModuleClosedNodes12= ModuleClosedNodes13= @@ -70,6 +70,6 @@ ModuleClosedNodes6= ModuleClosedNodes7=1,3 ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Main,Globals,24,0,Diseñador Visual,Cliente.bal,-100,1,kms_helperSubs,Class_Globals,0,0,C_Cliente,B_INV_Click,1154,0,C_Cliente,B_VENTA_Click,1218,6,C_Principal,t1_tick,2092,0,C_Principal,cargar_Click,868,0,C_Principal,SUBIR_P_Click,2640,0,B4XMainPage,B4XPage_Created,150,0,C_Principal,Subir_Click,589,0 +NavigationStack=C_Productos,B4XPage_Appear,267,0,C_Principal,Class_Globals,0,0,C_Nota,Class_Globals,0,0,C_Principal,cargar_Click,958,0,C_Cliente,Class_Globals,0,0,Diseñador Visual,Cliente.bal,-100,1,C_Cliente,B_INV_Click,1117,0,C_Cliente,GPS_LocationChanged,362,0,C_Cliente,gest_Click,434,0,C_Cliente,B_VENTA_Click,1226,0,C_Cliente,B4XPage_Appear,296,0 SelectedBuild=0 -VisibleModules=21,2,9,18,7,4,10,22,11,23 +VisibleModules=21,2,9,18,7,10,22,11,23,4 diff --git a/B4A/EscPosPrinter.bas b/B4A/EscPosPrinter.bas index 1a390d8..f0a9536 100644 --- a/B4A/EscPosPrinter.bas +++ b/B4A/EscPosPrinter.bas @@ -113,8 +113,11 @@ Public Sub Connect As Boolean PairedDevices = Serial1.GetPairedDevices Dim l As List l.Initialize + Log("aqui 1") For i = 0 To PairedDevices.Size - 1 l.Add(PairedDevices.GetKeyAt(i)) + Log("aqui 2") + DisConnect Next Dim Res As Int Res = InputList(l, "Choose a printer", -1) 'show list with paired devices 'ignore @@ -123,52 +126,25 @@ Public Sub Connect As Boolean 'Msgbox(PairedDevices.Get(l.Get(Res)),"mac") Starter.mac_impresora = PairedDevices.Get(l.Get(Res)) Return True + DisConnect + Log("aqui 3") End If + Log("aqui 4") Return False Else Serial1.Connect(Starter.mac_impresora) ' Starter.mac_impresora = colonia.MAC_IMPRESORA Return True + DisConnect + Log("aqui 5") End If Catch Log(LastException) + Return False End Try End Sub -'Public Sub Connect2 As Boolean -' 'leos -'' Serial1.Connect("88:6B:0F:3E:53:9E") -'' Return True -'' Try -'' If Starter.MAC_IMPRESORA = "0" Then -' Dim PairedDevices As Map -' PairedDevices = Serial1.GetPairedDevices -' Dim l As List -' l.Initialize -' For i = 0 To PairedDevices.Size - 1 -' l.Add(PairedDevices.GetKeyAt(i)) -' Next -' Dim Res As Int -' Res = InputList(l, "Choose a printer", -1) 'show list with paired devices 'ignore -' If Res <> DialogResponse.CANCEL Then -' Serial1.Connect(PairedDevices.Get(l.Get(Res))) 'convert the name to mac address -' 'Msgbox(PairedDevices.Get(l.Get(Res)),"mac") -' Starter.mac_impresora = PairedDevices.Get(l.Get(Res)) -' Return True -' End If -' Return False -'' Else -'' Serial1.Connect(Starter.mac_impresora) -'' ' Starter.mac_impresora = colonia.MAC_IMPRESORA -'' Return True -'' End If -'' Catch -'' Log(LastException) -'' End Try -'End Sub - - ' Disconnect the printer Public Sub DisConnect Serial1.Disconnect