diff --git a/Files/principal.bal b/Files/principal.bal index 310f476..7c3b7b0 100644 Binary files a/Files/principal.bal and b/Files/principal.bal differ diff --git a/Lanterna2.b4a b/Lanterna2.b4a index d42ed8e..cb356a8 100644 --- a/Lanterna2.b4a +++ b/Lanterna2.b4a @@ -86,7 +86,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Lanterna #VersionCode: 1 - #VersionName: 4.06.22 + #VersionName: 4.06.23 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: landscape #CanInstallToExternalStorage: False diff --git a/Lanterna2.b4a.meta b/Lanterna2.b4a.meta index 9cc8e0b..9f69110 100644 --- a/Lanterna2.b4a.meta +++ b/Lanterna2.b4a.meta @@ -22,6 +22,6 @@ ModuleClosedNodes4= ModuleClosedNodes5= ModuleClosedNodes6= ModuleClosedNodes7= -NavigationStack=Principal,b_imp3_Click,2176,0,Principal,b_pagoCerrar_Click,1422,0,Subs,traeTicket,684,0,Subs,traeConsecutivoTicket,1471,0,Principal,b_abrirMesa_Click,1258,0,Principal,b_resumen_Click,3486,6,Visual Designer,principal.bal,-100,6,Principal,cb_factura_CheckedChange,3562,0,Principal,b_imprimirTicket_Click,2557,1,Main,Process_Globals,29,0 +NavigationStack=Principal,b_pagoCerrar_Click,1422,0,Subs,traeTicket,684,0,Subs,traeConsecutivoTicket,1471,0,Principal,b_abrirMesa_Click,1258,0,Principal,b_resumen_Click,3486,6,Principal,cb_factura_CheckedChange,3562,0,Principal,b_imprimirTicket_Click,2557,1,Main,Process_Globals,29,0,Visual Designer,principal.bal,-100,6,Principal,Globals,118,0,Principal,llenaHistorial,1011,6 SelectedBuild=0 VisibleModules=6,5,7 diff --git a/Principal.bas b/Principal.bas index e13d57b..28542f2 100644 --- a/Principal.bas +++ b/Principal.bas @@ -980,7 +980,7 @@ Private Sub b_terminar_Click End Sub Sub llenaHistorial - Dim rs_hist As ResultSet = Starter.skmt.ExecQuery($"Select * from pedido_ticket where PT_PAGO <> 'VENTA' and PT_PAGO <> 'MULTI-TICKET' order by PT_PAGO desc, PT_TICKET"$) + Dim rs_hist As ResultSet = Starter.skmt.ExecQuery($"Select *, ifnull(PT_PAGO2,"") as pt from pedido_ticket where PT_PAGO <> 'VENTA' and PT_PAGO <> 'MULTI-TICKET' order by PT_PAGO desc, PT_TICKET"$) If rs_hist.RowCount > 0 Then l_historialVacio.Visible = False Private cs As CSBuilder @@ -1001,7 +1001,21 @@ Sub llenaHistorial label2.TextColor = Colors.RGB(1,127,1) Private fecha As String = rs_hist.GetString("PT_FECHA") fecha = fecha.SubString2(1,10) - lv_historial.AddTwoLines2(cs.Color(elColor).Append("Orden: " & rs_hist.GetString("PT_TICKET") & " - Mesa: " & rs_hist.GetString("PT_MESA")).PopAll, $"Fecha: ${fecha}, Productos: ${rs_hist.GetString("PT_NOART")}, Total: $${NumberFormat2(rs_hist.GetString("PT_MONTO"), 1, 2, 2, True)}"$, $"${rs_hist.GetString("PT_MESA")}|${rs_hist.GetString("PT_TICKET")}|${rs_hist.GetString("PT_PAGO")}|${rs_hist.GetString("PT_MESERO")}|${rs_hist.GetString("PT_COMENSALES")}|-|${rs_hist.GetString("PT_ORIGEN")}"$) + Private pt As String = "" + + If rs_hist.GetString("pt") = "Visa/Mastercard Credito" Or rs_hist.GetString("pt") = "Visa/Mastercard Debito" Then + pt = "Mifel" + Else if rs_hist.GetString("pt") = "American Express" Then + pt = "Amex" + else if rs_hist.GetString("pt") = "Efectivo" Then + pt = "Efectivo" + Else + pt = rs_hist.GetString("pt") + End If + + Private co As String = rs_hist.GetString("PT_COMENSALES") + + lv_historial.AddTwoLines2(cs.Color(elColor).Append("Orden: " & rs_hist.GetString("PT_TICKET") & " - Mesa: " & rs_hist.GetString("PT_MESA") & " - " & pt & " - C:" & co).PopAll, $"Fecha: ${fecha}, Productos: ${rs_hist.GetString("PT_NOART")}, Total: $${NumberFormat2(rs_hist.GetString("PT_MONTO"), 1, 2, 2, True)}"$, $"${rs_hist.GetString("PT_MESA")}|${rs_hist.GetString("PT_TICKET")}|${rs_hist.GetString("PT_PAGO")}|${rs_hist.GetString("PT_MESERO")}|${rs_hist.GetString("PT_COMENSALES")}|-|${rs_hist.GetString("PT_ORIGEN")}"$) Loop Else lv_historial.Visible = False