|
|
|
@@ -314,7 +314,7 @@ Sub Activity_Create(FirstTime As Boolean)
|
|
|
|
Subs.panelVisible(p_mesas, 0, 0)
|
|
|
|
Subs.panelVisible(p_mesas, 0, 0)
|
|
|
|
cb_comensales.SetItems(Array As String(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20))
|
|
|
|
cb_comensales.SetItems(Array As String(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20))
|
|
|
|
' cb_pago.SetItems(Array As String("American Express", "Visa/Mastercard", "Efectivo"))
|
|
|
|
' cb_pago.SetItems(Array As String("American Express", "Visa/Mastercard", "Efectivo"))
|
|
|
|
cb_pagoPropina.SetItems(Array As String("Amex", "Mifel", "Efectivo"))
|
|
|
|
cb_pagoPropina.SetItems(Array As String("Amex", "Banorte", "Efectivo"))
|
|
|
|
cb_mesero.SetItems(Subs.traeMeserosLista)
|
|
|
|
cb_mesero.SetItems(Subs.traeMeserosLista)
|
|
|
|
' Private lasCats As List = Subs.traeCategorias
|
|
|
|
' Private lasCats As List = Subs.traeCategorias
|
|
|
|
Starter.nivelActual = "Cats"
|
|
|
|
Starter.nivelActual = "Cats"
|
|
|
|
@@ -325,8 +325,8 @@ Sub Activity_Create(FirstTime As Boolean)
|
|
|
|
Private Label1 As Label = lv_categorias.SingleLineLayout.Label
|
|
|
|
Private Label1 As Label = lv_categorias.SingleLineLayout.Label
|
|
|
|
Label1.TextSize = 9dip
|
|
|
|
Label1.TextSize = 9dip
|
|
|
|
Label1.TextColor = Colors.Black
|
|
|
|
Label1.TextColor = Colors.Black
|
|
|
|
cb_nuevoPago.SetItems(Array As String("Amex", "Mifel", "Efectivo"))
|
|
|
|
cb_nuevoPago.SetItems(Array As String("Amex", "Banorte", "Efectivo"))
|
|
|
|
cb_nuevoPagoPropina.SetItems(Array As String("Amex", "Mifel", "Efectivo"))
|
|
|
|
cb_nuevoPagoPropina.SetItems(Array As String("Amex", "Banorte", "Efectivo"))
|
|
|
|
muestraCats
|
|
|
|
muestraCats
|
|
|
|
Log("################# PERMISOS BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
|
|
|
|
Log("################# PERMISOS BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
|
|
|
|
' Log("Permisos BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
|
|
|
|
' Log("Permisos BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
|
|
|
|
@@ -335,10 +335,10 @@ Sub Activity_Create(FirstTime As Boolean)
|
|
|
|
Wait For Activity_PermissionResult (Permission As String, Result As Boolean)
|
|
|
|
Wait For Activity_PermissionResult (Permission As String, Result As Boolean)
|
|
|
|
' If Result Then Log("Tenemos permisos de bluetooth.")
|
|
|
|
' If Result Then Log("Tenemos permisos de bluetooth.")
|
|
|
|
' Log($"Resultado del CheckAndRequest: ${Result}"$)
|
|
|
|
' Log($"Resultado del CheckAndRequest: ${Result}"$)
|
|
|
|
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_TARJETA = 'Mifel' where PT_TARJETA like '%Visa%'"$)
|
|
|
|
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_TARJETA = 'Banorte' where PT_TARJETA like '%Visa%'"$)
|
|
|
|
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO_PROPINA = 'Mifel' where PT_TARJETA like '%Visa%'"$)
|
|
|
|
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO_PROPINA = 'Banorte' where PT_TARJETA like '%Visa%'"$)
|
|
|
|
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO2 = 'Mifel' where PT_TARJETA like '%Visa%'"$)
|
|
|
|
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO2 = 'Banorte' where PT_TARJETA like '%Visa%'"$)
|
|
|
|
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO2 = 'Mifel' where PT_PAGO2 like '%Visa%'"$)
|
|
|
|
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO2 = 'Banorte' where PT_PAGO2 like '%Visa%'"$)
|
|
|
|
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_TARJETA = 'Amex' where PT_TARJETA like '%American%'"$)
|
|
|
|
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_TARJETA = 'Amex' where PT_TARJETA like '%American%'"$)
|
|
|
|
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO_PROPINA = 'Amex' where PT_TARJETA like '%American%'"$)
|
|
|
|
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO_PROPINA = 'Amex' where PT_TARJETA like '%American%'"$)
|
|
|
|
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO2 = 'Amex' where PT_TARJETA like '%American%'"$)
|
|
|
|
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO2 = 'Amex' where PT_TARJETA like '%American%'"$)
|
|
|
|
@@ -1054,8 +1054,8 @@ Sub llenaHistorial
|
|
|
|
fecha = fecha.SubString2(1,10)
|
|
|
|
fecha = fecha.SubString2(1,10)
|
|
|
|
Private pt As String = ""
|
|
|
|
Private pt As String = ""
|
|
|
|
|
|
|
|
|
|
|
|
If rs_hist.GetString("pt") = "Mifel" Or rs_hist.GetString("pt") = "Visa/Mastercard Debito" Then
|
|
|
|
If rs_hist.GetString("pt") = "Banorte" Or rs_hist.GetString("pt") = "Visa/Mastercard Debito" Then
|
|
|
|
pt = "Mifel"
|
|
|
|
pt = "Banorte"
|
|
|
|
Else if rs_hist.GetString("pt") = "Amex" Then
|
|
|
|
Else if rs_hist.GetString("pt") = "Amex" Then
|
|
|
|
pt = "Amex"
|
|
|
|
pt = "Amex"
|
|
|
|
else if rs_hist.GetString("pt") = "Efectivo" Then
|
|
|
|
else if rs_hist.GetString("pt") = "Efectivo" Then
|
|
|
|
@@ -2872,7 +2872,7 @@ Sub b_impAB_Click
|
|
|
|
Private prop As ResultSet = Starter.skmt.ExecQuery($"Select PT_PAGO_PROPINA, sum(PT_PROPINA) As PROPINA from PEDIDO_TICKET where pt_pago <> 'MULTI-TICKET' group by PT_PAGO_PROPINA
|
|
|
|
Private prop As ResultSet = Starter.skmt.ExecQuery($"Select PT_PAGO_PROPINA, sum(PT_PROPINA) As PROPINA from PEDIDO_TICKET where pt_pago <> 'MULTI-TICKET' group by PT_PAGO_PROPINA
|
|
|
|
order by CASE PT_PAGO_PROPINA
|
|
|
|
order by CASE PT_PAGO_PROPINA
|
|
|
|
WHEN 'Amex' THEN 0
|
|
|
|
WHEN 'Amex' THEN 0
|
|
|
|
WHEN 'Mifel' THEN 1
|
|
|
|
WHEN 'Banorte' THEN 1
|
|
|
|
WHEN 'Efectivo' THEN 2
|
|
|
|
WHEN 'Efectivo' THEN 2
|
|
|
|
END"$)
|
|
|
|
END"$)
|
|
|
|
If imprimirAqui Then Printer1.WriteString(CRLF)
|
|
|
|
If imprimirAqui Then Printer1.WriteString(CRLF)
|
|
|
|
@@ -2909,7 +2909,7 @@ Sub b_impAB_Click
|
|
|
|
group by PT_PAGO2
|
|
|
|
group by PT_PAGO2
|
|
|
|
order by CASE PT_PAGO_PROPINA
|
|
|
|
order by CASE PT_PAGO_PROPINA
|
|
|
|
WHEN 'Amex' THEN 0
|
|
|
|
WHEN 'Amex' THEN 0
|
|
|
|
WHEN 'Mifel' THEN 1
|
|
|
|
WHEN 'Banorte' THEN 1
|
|
|
|
WHEN 'Efectivo' THEN 2
|
|
|
|
WHEN 'Efectivo' THEN 2
|
|
|
|
END"$) ' and (CASE WHEN PT_PAGO = 'EFECTIVO' and PT_ALMACEN = 'MULTI-TICKET' THEN false ELSE true END) - El primer "case" es para que en el efectivo NO cuente los tickets multi-tickets, porque esos son "Consumo de alimentos".
|
|
|
|
END"$) ' and (CASE WHEN PT_PAGO = 'EFECTIVO' and PT_ALMACEN = 'MULTI-TICKET' THEN false ELSE true END) - El primer "case" es para que en el efectivo NO cuente los tickets multi-tickets, porque esos son "Consumo de alimentos".
|
|
|
|
Private totalComensales As Int = 0
|
|
|
|
Private totalComensales As Int = 0
|
|
|
|
@@ -2943,7 +2943,7 @@ Sub b_impAB_Click
|
|
|
|
Do While rtpa.NextRow
|
|
|
|
Do While rtpa.NextRow
|
|
|
|
propAmex = rtpa.GetString("ptPropina")
|
|
|
|
propAmex = rtpa.GetString("ptPropina")
|
|
|
|
Loop
|
|
|
|
Loop
|
|
|
|
Private rtpmc As ResultSet = Starter.skmt.ExecQuery($"Select ifnull(sum(pt_propina),0) as ptPropina, * from pedido_ticket where pt_pago_propina = 'Mifel' group by pt_pago_propina"$)
|
|
|
|
Private rtpmc As ResultSet = Starter.skmt.ExecQuery($"Select ifnull(sum(pt_propina),0) as ptPropina, * from pedido_ticket where pt_pago_propina = 'Banorte' group by pt_pago_propina"$)
|
|
|
|
Do While rtpmc.NextRow
|
|
|
|
Do While rtpmc.NextRow
|
|
|
|
propMifel = rtpmc.GetString("ptPropina")
|
|
|
|
propMifel = rtpmc.GetString("ptPropina")
|
|
|
|
Loop
|
|
|
|
Loop
|
|
|
|
@@ -2960,8 +2960,8 @@ Sub b_impAB_Click
|
|
|
|
' Log("ES AMEX")
|
|
|
|
' Log("ES AMEX")
|
|
|
|
montoAmex = monto
|
|
|
|
montoAmex = monto
|
|
|
|
monto = monto + propAmex
|
|
|
|
monto = monto + propAmex
|
|
|
|
else If elPago = "Mifel" Then
|
|
|
|
else If elPago = "Banorte" Then
|
|
|
|
' Log("ES MIFEL")
|
|
|
|
' Log("ES Banorte")
|
|
|
|
montoMifel = monto
|
|
|
|
montoMifel = monto
|
|
|
|
monto = monto + propMifel
|
|
|
|
monto = monto + propMifel
|
|
|
|
else If elPago = "Efectivo" Then
|
|
|
|
else If elPago = "Efectivo" Then
|
|
|
|
@@ -3524,8 +3524,8 @@ Sub agregaFormaDePago(left0 As Int, top0 As Int, tag0 As Int, brinco As Int)
|
|
|
|
cb_pago2.Tag = tag0
|
|
|
|
cb_pago2.Tag = tag0
|
|
|
|
' cb_pago2.mBase.SetTextSizeAnimated(0, 14dip)
|
|
|
|
' cb_pago2.mBase.SetTextSizeAnimated(0, 14dip)
|
|
|
|
et_montoPago2.Tag = tag0
|
|
|
|
et_montoPago2.Tag = tag0
|
|
|
|
cb_pago2.SetItems(Array As String("Amex", "Mifel", "Efectivo"))
|
|
|
|
cb_pago2.SetItems(Array As String("Amex", "Banorte", "Efectivo"))
|
|
|
|
If Starter.ticketFactura Then cb_pago2.SetItems(Array As String("Amex", "Mifel"))
|
|
|
|
If Starter.ticketFactura Then cb_pago2.SetItems(Array As String("Amex", "Banorte"))
|
|
|
|
p_num.Tag = tag0
|
|
|
|
p_num.Tag = tag0
|
|
|
|
listaFormasDePagoCB.Add(cb_pago2)
|
|
|
|
listaFormasDePagoCB.Add(cb_pago2)
|
|
|
|
listaFormaDePago.Add(cb_pago2.SelectedItem)
|
|
|
|
listaFormaDePago.Add(cb_pago2.SelectedItem)
|
|
|
|
@@ -3551,7 +3551,7 @@ Private Sub cb_pago2_SelectedIndexChanged (Index As Int)
|
|
|
|
listaFormaDePago.Set(Sender.As(B4XComboBox).tag - 1, Sender.As(B4XComboBox).SelectedItem)
|
|
|
|
listaFormaDePago.Set(Sender.As(B4XComboBox).tag - 1, Sender.As(B4XComboBox).SelectedItem)
|
|
|
|
If Sender.As(B4XComboBox).SelectedItem = "Amex" Then
|
|
|
|
If Sender.As(B4XComboBox).SelectedItem = "Amex" Then
|
|
|
|
cb_pagoPropina.SelectedIndex = 0
|
|
|
|
cb_pagoPropina.SelectedIndex = 0
|
|
|
|
Else If Sender.As(B4XComboBox).SelectedItem = "Mifel" Then
|
|
|
|
Else If Sender.As(B4XComboBox).SelectedItem = "Banorte" Then
|
|
|
|
cb_pagoPropina.SelectedIndex = 1
|
|
|
|
cb_pagoPropina.SelectedIndex = 1
|
|
|
|
else If Sender.As(B4XComboBox).SelectedItem = "Efectivo" Then
|
|
|
|
else If Sender.As(B4XComboBox).SelectedItem = "Efectivo" Then
|
|
|
|
cb_pagoPropina.SelectedIndex = 2
|
|
|
|
cb_pagoPropina.SelectedIndex = 2
|
|
|
|
@@ -4476,10 +4476,10 @@ Private Sub b_resumen_Click
|
|
|
|
If o.GetString("PT_FACTURAR") = "true" Then l_comprobante.Text = "FACTURA"
|
|
|
|
If o.GetString("PT_FACTURAR") = "true" Then l_comprobante.Text = "FACTURA"
|
|
|
|
l_formaPago.Text = o.GetString("PT_PAGO2")
|
|
|
|
l_formaPago.Text = o.GetString("PT_PAGO2")
|
|
|
|
Select o.GetString("PT_PAGO_PROPINA")
|
|
|
|
Select o.GetString("PT_PAGO_PROPINA")
|
|
|
|
Case "Mifel"
|
|
|
|
Case "Banorte"
|
|
|
|
l_propinaPago.Text = "Mifel"
|
|
|
|
l_propinaPago.Text = "Banorte"
|
|
|
|
Case "Visa/Mastercard Debito"
|
|
|
|
Case "Visa/Mastercard Debito"
|
|
|
|
l_propinaPago.Text = "Mifel Debito"
|
|
|
|
l_propinaPago.Text = "Banorte Debito"
|
|
|
|
Case "Amex"
|
|
|
|
Case "Amex"
|
|
|
|
l_propinaPago.Text = "Amex"
|
|
|
|
l_propinaPago.Text = "Amex"
|
|
|
|
Case "Efectivo"
|
|
|
|
Case "Efectivo"
|
|
|
|
@@ -4496,7 +4496,7 @@ Private Sub b_resumen_Click
|
|
|
|
Do While rtpa.NextRow
|
|
|
|
Do While rtpa.NextRow
|
|
|
|
propAmex = rtpa.GetString("ptPropina")
|
|
|
|
propAmex = rtpa.GetString("ptPropina")
|
|
|
|
Loop
|
|
|
|
Loop
|
|
|
|
Private rtpmc As ResultSet = Starter.skmt.ExecQuery($"Select ifnull(sum(pt_propina),0) as ptPropina, * from pedido_ticket where pt_pago_propina = 'Mifel' group by pt_pago_propina"$)
|
|
|
|
Private rtpmc As ResultSet = Starter.skmt.ExecQuery($"Select ifnull(sum(pt_propina),0) as ptPropina, * from pedido_ticket where pt_pago_propina = 'Banorte' group by pt_pago_propina"$)
|
|
|
|
Do While rtpmc.NextRow
|
|
|
|
Do While rtpmc.NextRow
|
|
|
|
propMifel = rtpmc.GetString("ptPropina")
|
|
|
|
propMifel = rtpmc.GetString("ptPropina")
|
|
|
|
Loop
|
|
|
|
Loop
|
|
|
|
@@ -4525,7 +4525,7 @@ Private Sub b_resumen_Click
|
|
|
|
l_consumoAmex.Text = $"$${NumberFormat2(rt.GetString("ptMonto"), 1, 2, 2, True)}"$
|
|
|
|
l_consumoAmex.Text = $"$${NumberFormat2(rt.GetString("ptMonto"), 1, 2, 2, True)}"$
|
|
|
|
' l_propinaAmex.Text = $"$${NumberFormat2(rt.GetString("ptPropina"), 1, 2, 2, True)}"$
|
|
|
|
' l_propinaAmex.Text = $"$${NumberFormat2(rt.GetString("ptPropina"), 1, 2, 2, True)}"$
|
|
|
|
l_totalAmex.Text = $"$${NumberFormat2((rt.GetString("ptMonto") + propAmex), 1, 2, 2, True)}"$
|
|
|
|
l_totalAmex.Text = $"$${NumberFormat2((rt.GetString("ptMonto") + propAmex), 1, 2, 2, True)}"$
|
|
|
|
else if rt.GetString("PT_PAGO2") = "Mifel" Then
|
|
|
|
else if rt.GetString("PT_PAGO2") = "Banorte" Then
|
|
|
|
l_consumoTDC.Text = $"$${NumberFormat2(rt.GetString("ptMonto"), 1, 2, 2, True)}"$
|
|
|
|
l_consumoTDC.Text = $"$${NumberFormat2(rt.GetString("ptMonto"), 1, 2, 2, True)}"$
|
|
|
|
' l_propinaTDC.Text = $"$${NumberFormat2(rt.GetString("ptPropina"), 1, 2, 2, True)}"$
|
|
|
|
' l_propinaTDC.Text = $"$${NumberFormat2(rt.GetString("ptPropina"), 1, 2, 2, True)}"$
|
|
|
|
l_totalTDC.Text = $"$${NumberFormat2((rt.GetString("ptMonto") + propMifel), 1, 2, 2, True)}"$
|
|
|
|
l_totalTDC.Text = $"$${NumberFormat2((rt.GetString("ptMonto") + propMifel), 1, 2, 2, True)}"$
|
|
|
|
@@ -4609,6 +4609,8 @@ Private Sub p_resItem_LongClick
|
|
|
|
p_transparenteCambioPagos.Visible = True
|
|
|
|
p_transparenteCambioPagos.Visible = True
|
|
|
|
End Sub
|
|
|
|
End Sub
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
'update PEDIDO_TICKET set PT_PAGO_PROPINA = 'Amex', PT_PAGO2 = 'Amex', PT_TARJETA = 'Amex' where PT_MESA = '1' and PT_TICKET = '00001'
|
|
|
|
|
|
|
|
|
|
|
|
Private Sub b_cambioPagos_Click
|
|
|
|
Private Sub b_cambioPagos_Click
|
|
|
|
p_transparenteCambioPagos.Visible = False
|
|
|
|
p_transparenteCambioPagos.Visible = False
|
|
|
|
Log(Sender.As(Button).tag)
|
|
|
|
Log(Sender.As(Button).tag)
|
|
|
|
@@ -4617,11 +4619,11 @@ Private Sub b_cambioPagos_Click
|
|
|
|
If alm = "null" Then alm = ""
|
|
|
|
If alm = "null" Then alm = ""
|
|
|
|
Log("|" & alm & "|")
|
|
|
|
Log("|" & alm & "|")
|
|
|
|
If alm = "MULTI-TICKET" Then
|
|
|
|
If alm = "MULTI-TICKET" Then
|
|
|
|
Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_MONTO = '${et_nuevoPago.text}', PT_PROPINA = '${et_nuevoPagoPropina.text}', PT_PAGO_PROPINA = '${cambioPagoPropina}', PT_PAGO2 = '${cambioPago}' where PT_MESA = '${m.Get("mesa")}' and PT_TICKET = '${m.Get("ticket")}'"$)
|
|
|
|
Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_MONTO = '${et_nuevoPago.text}', PT_PROPINA = '${et_nuevoPagoPropina.text}', PT_PAGO_PROPINA = '${cambioPagoPropina}', PT_PAGO2 = '${cambioPago}' where PT_MESA = '${m.Get("mesa")}' and PT_TICKET = '${m.Get("ticket")}'"$)
|
|
|
|
Log($"update PEDIDO_TICKET set PT_PAGO_PROPINA = '${cambioPagoPropina}', PT_PAGO2 = '${cambioPago}' where PT_MESA = '${m.Get("mesa")}' and PT_TICKET = '${m.Get("ticket")}''"$)
|
|
|
|
Log($"update PEDIDO_TICKET set PT_MONTO = '${et_nuevoPago.text}', PT_PROPINA = '${et_nuevoPagoPropina.text}', PT_PAGO_PROPINA = '${cambioPagoPropina}', PT_PAGO2 = '${cambioPago}' where PT_MESA = '${m.Get("mesa")}' and PT_TICKET = '${m.Get("ticket")}'"$)
|
|
|
|
Else
|
|
|
|
Else
|
|
|
|
Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_PAGO_PROPINA = '${cambioPagoPropina}', PT_PAGO2 = '${cambioPago}', PT_TARJETA = '${cambioPago}' where PT_MESA = '${m.Get("mesa")}' and PT_TICKET = '${m.Get("ticket")}'"$)
|
|
|
|
Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_MONTO = '${et_nuevoPago.text}', PT_PROPINA = '${et_nuevoPagoPropina.text}', PT_PAGO_PROPINA = '${cambioPagoPropina}', PT_PAGO2 = '${cambioPago}', PT_TARJETA = '${cambioPago}' where PT_MESA = '${m.Get("mesa")}' and PT_TICKET = '${m.Get("ticket")}'"$)
|
|
|
|
Log($"update PEDIDO_TICKET set PT_PAGO_PROPINA = '${cambioPagoPropina}', PT_PAGO2 = '${cambioPago}', PT_TARJETA = '${cambioPago}' where PT_MESA = '${m.Get("mesa")}' and PT_TICKET = '${m.Get("ticket")}'"$)
|
|
|
|
Log($"update PEDIDO_TICKET set PT_MONTO = '${et_nuevoPago.text}', PT_PROPINA = '${et_nuevoPagoPropina.text}', PT_PAGO_PROPINA = '${cambioPagoPropina}', PT_PAGO2 = '${cambioPago}', PT_TARJETA = '${cambioPago}' where PT_MESA = '${m.Get("mesa")}' and PT_TICKET = '${m.Get("ticket")}'"$)
|
|
|
|
End If
|
|
|
|
End If
|
|
|
|
b_resumen_Click
|
|
|
|
b_resumen_Click
|
|
|
|
End Sub
|
|
|
|
End Sub
|
|
|
|
|
