diff --git a/Files/login.bal b/Files/login.bal index 3a33234..e2c530c 100644 Binary files a/Files/login.bal and b/Files/login.bal differ diff --git a/Lanterna2.b4a b/Lanterna2.b4a index 5b40027..5be32e0 100644 --- a/Lanterna2.b4a +++ b/Lanterna2.b4a @@ -90,7 +90,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Lanterna #VersionCode: 1 - #VersionName: 4.08.19 + #VersionName: 4.08.30 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: landscape #CanInstallToExternalStorage: False @@ -152,6 +152,7 @@ Sub Globals Dim habilitarImportarDesdeWA As Boolean = False Private b_update As Button Private b_borraEfectivo As Button + Private user As EditText End Sub Sub Activity_Create(FirstTime As Boolean) @@ -317,7 +318,7 @@ Private Sub i_conf_Click p_botones.BringToFront p_botones.Top = p_server.Top + p_server.Height - 10dip End If - + If user.text.Trim = "KMTS7" Then b_borraEfectivo.Visible = true else b_borraEfectivo.Visible = False End Sub Private Sub b_cargaProductos_Click @@ -485,7 +486,7 @@ Private Sub b_entrar_LongClick End Sub Private Sub user_TextChanged (Old As String, New As String) - If New.Trim = "KMTS1" Then i_conf.Visible = True Else i_conf.Visible = False + If New.Trim = "KMTS1" or New.Trim = "KMTS7" Then i_conf.Visible = True Else i_conf.Visible = False End Sub Private Sub cb_impresionActiva_CheckedChange(Checked As Boolean) diff --git a/Lanterna2.b4a.meta b/Lanterna2.b4a.meta index cd439c1..385c0fa 100644 --- a/Lanterna2.b4a.meta +++ b/Lanterna2.b4a.meta @@ -18,7 +18,7 @@ ModuleBreakpoints6= ModuleBreakpoints7= ModuleBreakpoints8= ModuleBreakpoints9= -ModuleClosedNodes0=6,7,8,9,10,13,16,19,20,21,22 +ModuleClosedNodes0=6,7,8,9,10,13,16,20,21,22 ModuleClosedNodes1= ModuleClosedNodes2= ModuleClosedNodes3= @@ -28,6 +28,6 @@ ModuleClosedNodes6=6 ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Principal,b_cierreTotal_LongClick,1758,0,Principal,borrarEfectivo,3349,0,Main,Activity_Create,89,0,Main,b_server_Click,169,0,Main,b_fix_Click,428,0,Starter,JobDone,104,0,Main,b_cargaProductos_Click,243,0,Main,JobDone,269,0,Principal,b_envioInfo_Click,3280,0,Principal,JobDone,3329,6 +NavigationStack=Principal,JobDone,3329,6,Main,user_TextChanged,399,1,Visual Designer,login.bal,-100,3,Principal,imprimeResumenGrupos,2048,0,Visual Designer,principal.bal,-100,5,Principal,b_cierraParcial_Click,1695,0,Principal,b_cierreTotal_Click,1677,3,Principal,b_imp3_Click,2526,0,Principal,b_impAB_Click,2956,0,Main,i_conf_Click,231,6 SelectedBuild=0 VisibleModules=7,6,8,1 diff --git a/Principal.bas b/Principal.bas index 78f1294..3c4e1cb 100644 --- a/Principal.bas +++ b/Principal.bas @@ -1634,7 +1634,15 @@ End Sub Private Sub b_cierreTotal_Click ' Log("click") b_envioInfo.Enabled = True - If Subs.revisaEfectivoBorrado Then b_imp.Text = "Imprimir" & CRLF & "Z" Else b_imp.Text = "Imprimir" & CRLF & "A + B" + If Subs.revisaEfectivoBorrado Then + b_imp.Text = "Imprimir" & CRLF & "Z" + b_envioInfo.Visible = False + b_imp3.Visible = False + Else + b_imp.Text = "Imprimir" & CRLF & "A + B" + b_envioInfo.Visible = True + b_imp3.Visible = True + End If sv_resumen.Panel.Height = p_resumen.Height l_resumen.Width = sv_resumen.Width - 20dip cs.Initialize @@ -1691,7 +1699,16 @@ Private Sub b_cierraParcial_Click sv_resumen.Panel.Height = p_resumen.Height l_resumen.Width = sv_resumen.Width - 20dip b_envioInfo.Enabled = False - If Subs.revisaEfectivoBorrado Then b_imp.Text = "Imprimir" & CRLF & "Z" Else b_imp.Text = "Imprimir" & CRLF & "A + B" +' If Subs.revisaEfectivoBorrado Then b_imp.Text = "Imprimir" & CRLF & "Z" Else b_imp.Text = "Imprimir" & CRLF & "A + B" + If Subs.revisaEfectivoBorrado Then + b_imp.Text = "Imprimir" & CRLF & "Z" + b_envioInfo.Visible = False + b_imp3.Visible = False + Else + b_imp.Text = "Imprimir" & CRLF & "A + B" + b_envioInfo.Visible = True + b_imp3.Visible = True + End If cs.Initialize Log(l_resumen.text) Private c As Cursor = Starter.skmt.ExecQuery("select PE_MESA, PE_TIPO, PE_TICKET, sum(PE_COSTO_TOT) as SUBTOT from PEDIDO group by PE_MESA, pe_tipo, PE_TICKET order by PE_MESA, PE_TIPO desc") @@ -2651,6 +2668,14 @@ Sub b_impAB_Click DateTime.DateFormat = "dd/MM/yyyy" sDate = DateTime.Date(DateTime.Now) sTime = DateTime.Time(DateTime.Now) + Private tf As Cursor = Starter.skmt.ExecQuery($"select pe_fecha from pedido limit 1"$) ' Traemos la fecha del pedido. + If tf.RowCount > 0 Then + tf.Position = 0 + Private laFecha() As String = Regex.Split(" ", tf.GetString("PE_FECHA")) 'Traemos la fecha del PEDIDO. + If imprimirAqui Then Printer1.WriteString($"Fecha: ${laFecha(0)} ${sTime} ${CRLF}${CRLF}"$) + cs.Color(Colors.red).Append($"Fecha: ${laFecha(0)} ${sTime}${CRLF}"$).pop + Log($"Fecha: ${laFecha(0)} ${sTime} ${CRLF}${CRLF}"$) + End If Private c As Cursor = Starter.skmt.ExecQuery($"select M_ESTATUS from CAT_MESAS where M_ESTATUS = 'ABIERTA'"$) ' Log(c.RowCount) @@ -2945,7 +2970,7 @@ Sub b_impAB_Click cs.Color(Colors.DarkGray).Append($"TOTAL PAGOS: ........... $${totalPagos} ${CRLF}"$).pop Log($"TOTAL PAGOS: .........${i}.. $${totalPagos} ${CRLF}"$) - If Not(Subs.revisaEfectivoBorrado) Or 1 = 1 Then ' Si es corte Z entonces no ponemos el Total sin propinas. + If Not(Subs.revisaEfectivoBorrado) Then ' Si es corte Z entonces no ponemos el Total sin propinas. 'TOTAL SIN PROPINAS If imprimirAqui Then Printer1.WriteString(CRLF) If imprimirAqui Then Printer1.WriteString(Printer1.BOLD)