- VERSION 4.08.01

- Se cambio el formato de fecha a dd/mm/aa
- Se agrego una funcion para saber si ya se borro el efectivo o no.
- Si ya se borro el efectivo, cambiamos el texto del boton de "A + B" a "Z".
- Se agregó la variable "EFECTIVO BORRADO" a CAT_VARIABLES.
This commit is contained in:
Jose Alberto Guerra Ugalde
2024-08-03 03:28:44 -06:00
parent a14a8c9278
commit c5a218fe92
5 changed files with 36 additions and 13 deletions

View File

@@ -210,6 +210,7 @@ Sub Globals
Private b_prevPagina As Button
Private et_nuevoPago As EditText
Private et_nuevoPagoPropina As EditText
Private p_botonesCierreTotal As Panel
End Sub
Sub Activity_Create(FirstTime As Boolean)
@@ -295,6 +296,7 @@ Sub Activity_Create(FirstTime As Boolean)
b_prevPagina.Left = p_selBuscar.Left + p_selBuscar.Width
l_panelEnUso.left = b_prevPagina.Left + b_prevPagina.Width
b_sigPagina.left = l_panelEnUso.Left + l_panelEnUso.Width
p_botonesCierreTotal.Top = p_botonesCierreTotal.Top - 20dip
End If
' Subs.centraPanel(p_botonesProds, p_mesaAbierta.Width)
Subs.centraPanel(p_mesaCampos, Activity.Width)
@@ -1632,6 +1634,7 @@ 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"
sv_resumen.Panel.Height = p_resumen.Height
l_resumen.Width = sv_resumen.Width - 20dip
cs.Initialize
@@ -1688,6 +1691,7 @@ 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"
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")
@@ -1765,6 +1769,8 @@ Private Sub et_inicioDia_EnterPressed
et_inicioDia.Text = ""
Starter.skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("CIERRE ADMIN"))
Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("CIERRE ADMIN","0"))
Starter.skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("EFECTIVO BORRADO"))
Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("EFECTIVO BORRADO","0"))
Starter.skmt.ExecNonQuery("delete from PEDIDO")
Starter.skmt.ExecNonQuery("delete from PEDIDO_TICKET")
End If
@@ -1869,7 +1875,7 @@ Sub imprimeResumenMesas
Printer1.WriteString(Printer1.BOLD)
If imprimirAqui Then Printer1.WriteString("LA LANTERNA RISTORANTE" & CRLF)
Printer1.WriteString(Printer1.NOBOLD)
DateTime.DateFormat = "MM/dd/yyyy"
DateTime.DateFormat = "dd/MM/yyyy"
sDate = DateTime.Date(DateTime.Now)
sTime = DateTime.Time(DateTime.Now)
@@ -2023,7 +2029,7 @@ Sub imprimeResumenGrupos
Printer1.WriteString(Printer1.BOLD)
If imprimirAqui Then Printer1.WriteString("LA LANTERNA RISTORANTE" & CRLF)
Printer1.WriteString(Printer1.NOBOLD)
DateTime.DateFormat = "MM/dd/yyyy"
DateTime.DateFormat = "dd/MM/yyyy"
sDate = DateTime.Date(DateTime.Now)
sTime = DateTime.Time(DateTime.Now)
@@ -2483,7 +2489,7 @@ Sub b_imp3_Click
Printer1.WriteString(Printer1.BOLD)
If imprimirAqui Then Printer1.WriteString("LA LANTERNA RISTORANTE" & CRLF)
Printer1.WriteString(Printer1.NOBOLD)
DateTime.DateFormat = "MM/dd/yyyy"
DateTime.DateFormat = "dd/MM/yyyy"
sDate = DateTime.Date(DateTime.Now)
sTime = DateTime.Time(DateTime.Now)
@@ -2622,7 +2628,7 @@ Sub b_impAB_Click
If imprimirAqui Then Printer1.WriteString(Printer1.BOLD)
If imprimirAqui Then Printer1.WriteString("LA LANTERNA RISTORANTE" & CRLF)
If imprimirAqui Then Printer1.WriteString(Printer1.NOBOLD)
DateTime.DateFormat = "MM/dd/yyyy"
DateTime.DateFormat = "dd/MM/yyyy"
sDate = DateTime.Date(DateTime.Now)
sTime = DateTime.Time(DateTime.Now)
Private c As Cursor = Starter.skmt.ExecQuery($"select M_ESTATUS from CAT_MESAS where M_ESTATUS = 'ABIERTA'"$)
@@ -3015,7 +3021,7 @@ Sub b_imp_VIEJO_Click
' c=Starter.skmt.ExecQuery("select USUARIO from usuarioa")
' c.Position=0
Private usuario As String = "USUARIO"
DateTime.DateFormat = "MM/dd/yyyy"
DateTime.DateFormat = "dd/MM/yyyy"
Private sDate,sTime As String
sDate = DateTime.Date(DateTime.Now)
sTime = DateTime.Time(DateTime.Now)
@@ -3045,7 +3051,7 @@ Sub b_imp_VIEJO_Click
Printer1.WriteString("LA LANTERNA RISTORANTE" & CRLF)
Printer1.WriteString("No. Ticket: " & Starter.ticketActual & CRLF)
DateTime.DateFormat = "MM/dd/yyyy"
DateTime.DateFormat = "dd/MM/yyyy"
sDate=DateTime.Date(DateTime.Now)
Printer1.WriteString(sDate &" " & sTime & CRLF)
@@ -3261,7 +3267,7 @@ Private Sub b_envioInfo_Click
End Sub
Sub JobDone(Job As HttpJob)
' Log("JOBDONE PRINCIPAL")
Log("JOBDONE PRINCIPAL")
reqManager.trackNext(Job)
If Not(Job.Success) Then
LogColor("Error: " & Job.tag & " : " & Job.ErrorMessage, Colors.red)
@@ -3297,6 +3303,8 @@ Sub borrarEfectivo
Starter.skmt.ExecNonQuery($"delete from PEDIDO where PE_TIPO = 'EFECTIVO'"$)
Starter.skmt.ExecNonQuery($"delete from PEDIDO_TICKET where PT_PAGO = 'EFECTIVO'"$)
Starter.skmt.ExecNonQuery($"delete from PEDIDO_TICKET where PT_PAGO2 = 'Efectivo'"$)
Starter.skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("EFECTIVO BORRADO"))
Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("EFECTIVO BORRADO","1"))
End Sub
Private Sub b_regresarProds_Click
@@ -3762,7 +3770,7 @@ Private Sub b_leyendaDescuento_Click
impresoraConectada = False
End If
End If
DateTime.DateFormat = "MM/dd/yyyy"
DateTime.DateFormat = "dd/MM/yyyy"
Private sDate,sTime As String
sDate = DateTime.Date(DateTime.Now)
sTime = DateTime.Time(DateTime.Now)