diff --git a/Files/principal.bal b/Files/principal.bal index 6ff7d5e..c026770 100644 Binary files a/Files/principal.bal and b/Files/principal.bal differ diff --git a/Lanterna2.b4a b/Lanterna2.b4a index b91c416..ccca91c 100644 --- a/Lanterna2.b4a +++ b/Lanterna2.b4a @@ -90,7 +90,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Lanterna #VersionCode: 1 - #VersionName: 5.03.28 + #VersionName: 5.05.12 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: landscape #CanInstallToExternalStorage: False diff --git a/Lanterna2.b4a.meta b/Lanterna2.b4a.meta index bed73b1..7954057 100644 --- a/Lanterna2.b4a.meta +++ b/Lanterna2.b4a.meta @@ -28,6 +28,6 @@ ModuleClosedNodes6=6 ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Principal,b_impAB_Click,2998,6,Principal,l_prods_Click,399,6,Principal,b_prodMenos_Click,621,0,Principal,b_prodMas_Click,668,0,Diseñador Visual,proditem.bal,-100,1,Diseñador Visual,principal.bal,-100,5,Principal,p_mesasItem_Click,1220,0,Principal,b_reimprimirTicket_Click,4628,0,Principal,p_resItem_LongClick,4605,0,Principal,b_cambioPagos_Click,4611,0 +NavigationStack=Principal,b_cambioPagos_Click,4613,0,Principal,p_resItem_LongClick,4604,0,Principal,Activity_Create,331,1,Principal,llenaHistorial,1051,0,Principal,agregaFormaDePago,3521,0,Principal,cb_pago2_SelectedIndexChanged,3547,0,Principal,b_impAB_Click,2994,0,Diseñador Visual,mainpage.bal,-100,1,Diseñador Visual,principal.bal,-100,2,Principal,b_resumen_Click,4517,0 SelectedBuild=0 VisibleModules=7,6,8,1 diff --git a/Principal.bas b/Principal.bas index c1358eb..d49f2a6 100644 --- a/Principal.bas +++ b/Principal.bas @@ -314,7 +314,7 @@ Sub Activity_Create(FirstTime As Boolean) 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_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) ' Private lasCats As List = Subs.traeCategorias Starter.nivelActual = "Cats" @@ -325,8 +325,8 @@ Sub Activity_Create(FirstTime As Boolean) Private Label1 As Label = lv_categorias.SingleLineLayout.Label Label1.TextSize = 9dip Label1.TextColor = Colors.Black - cb_nuevoPago.SetItems(Array As String("Amex", "Mifel", "Efectivo")) - cb_nuevoPagoPropina.SetItems(Array As String("Amex", "Mifel", "Efectivo")) + cb_nuevoPago.SetItems(Array As String("Amex", "Banorte", "Efectivo")) + cb_nuevoPagoPropina.SetItems(Array As String("Amex", "Banorte", "Efectivo")) muestraCats 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) ' If Result Then Log("Tenemos permisos de bluetooth.") ' 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_PAGO_PROPINA = 'Mifel' 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 = 'Mifel' where PT_PAGO2 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 = 'Banorte' 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 = '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_PAGO_PROPINA = '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) Private pt As String = "" - If rs_hist.GetString("pt") = "Mifel" Or rs_hist.GetString("pt") = "Visa/Mastercard Debito" Then - pt = "Mifel" + If rs_hist.GetString("pt") = "Banorte" Or rs_hist.GetString("pt") = "Visa/Mastercard Debito" Then + pt = "Banorte" Else if rs_hist.GetString("pt") = "Amex" Then pt = "Amex" 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 order by CASE PT_PAGO_PROPINA WHEN 'Amex' THEN 0 - WHEN 'Mifel' THEN 1 + WHEN 'Banorte' THEN 1 WHEN 'Efectivo' THEN 2 END"$) If imprimirAqui Then Printer1.WriteString(CRLF) @@ -2909,7 +2909,7 @@ Sub b_impAB_Click group by PT_PAGO2 order by CASE PT_PAGO_PROPINA WHEN 'Amex' THEN 0 - WHEN 'Mifel' THEN 1 + WHEN 'Banorte' THEN 1 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". Private totalComensales As Int = 0 @@ -2943,7 +2943,7 @@ Sub b_impAB_Click Do While rtpa.NextRow propAmex = rtpa.GetString("ptPropina") 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 propMifel = rtpmc.GetString("ptPropina") Loop @@ -2960,8 +2960,8 @@ Sub b_impAB_Click ' Log("ES AMEX") montoAmex = monto monto = monto + propAmex - else If elPago = "Mifel" Then -' Log("ES MIFEL") + else If elPago = "Banorte" Then +' Log("ES Banorte") montoMifel = monto monto = monto + propMifel 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.mBase.SetTextSizeAnimated(0, 14dip) et_montoPago2.Tag = tag0 - cb_pago2.SetItems(Array As String("Amex", "Mifel", "Efectivo")) - If Starter.ticketFactura Then cb_pago2.SetItems(Array As String("Amex", "Mifel")) + cb_pago2.SetItems(Array As String("Amex", "Banorte", "Efectivo")) + If Starter.ticketFactura Then cb_pago2.SetItems(Array As String("Amex", "Banorte")) p_num.Tag = tag0 listaFormasDePagoCB.Add(cb_pago2) 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) If Sender.As(B4XComboBox).SelectedItem = "Amex" Then cb_pagoPropina.SelectedIndex = 0 - Else If Sender.As(B4XComboBox).SelectedItem = "Mifel" Then + Else If Sender.As(B4XComboBox).SelectedItem = "Banorte" Then cb_pagoPropina.SelectedIndex = 1 else If Sender.As(B4XComboBox).SelectedItem = "Efectivo" Then cb_pagoPropina.SelectedIndex = 2 @@ -4476,10 +4476,10 @@ Private Sub b_resumen_Click If o.GetString("PT_FACTURAR") = "true" Then l_comprobante.Text = "FACTURA" l_formaPago.Text = o.GetString("PT_PAGO2") Select o.GetString("PT_PAGO_PROPINA") - Case "Mifel" - l_propinaPago.Text = "Mifel" + Case "Banorte" + l_propinaPago.Text = "Banorte" Case "Visa/Mastercard Debito" - l_propinaPago.Text = "Mifel Debito" + l_propinaPago.Text = "Banorte Debito" Case "Amex" l_propinaPago.Text = "Amex" Case "Efectivo" @@ -4496,7 +4496,7 @@ Private Sub b_resumen_Click Do While rtpa.NextRow propAmex = rtpa.GetString("ptPropina") 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 propMifel = rtpmc.GetString("ptPropina") Loop @@ -4525,7 +4525,7 @@ Private Sub b_resumen_Click l_consumoAmex.Text = $"$${NumberFormat2(rt.GetString("ptMonto"), 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)}"$ - 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_propinaTDC.Text = $"$${NumberFormat2(rt.GetString("ptPropina"), 1, 2, 2, True)}"$ l_totalTDC.Text = $"$${NumberFormat2((rt.GetString("ptMonto") + propMifel), 1, 2, 2, True)}"$