diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 417ae97..18af6ba 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -75,6 +75,12 @@ Sub Class_Globals Dim p_transparenteCierreAdmin As Panel Private cd1 As ColorDrawable Private p_botonesCierre As Panel + Private p_transparenteResumen As Panel + Private p_resumen As Panel + Private l_resumen As Label + Private sv_resumen As ScrollView + Dim su As StringUtils + Dim cs As CSBuilder End Sub 'You can add more parameters here. @@ -113,8 +119,10 @@ Private Sub B4XPage_Created (Root1 As B4XView) p_mesas.Height = Root.Height - WobbleMenu1.Height p_historial.Width = Root.Width p_historial.Height = Root.Height - WobbleMenu1.Height - p_transparenteCierreAdmin.Height = Root.Height : p_transparenteCierreAdmin.Width = Root.Width + Subs.panelWH(p_transparenteCierreAdmin, Root.Width, Root.Height) p_transparenteCierreAdmin.Top = 0 : p_transparenteCierreAdmin.left = 0 + Subs.panelWH(p_transparenteResumen, Root.Width, Root.Height) + sv_resumen.Panel.LoadLayout("resumenCont") Dim cs As CSBuilder cs.Initialize l_inicioDia.Text = cs.append("Para iniciar día, ingrese el texto ").bold.Append("INICIO DIA").Pop.Append(" y la tecla ").Bold.Append("Retorno").Pop.Append(" del teclado.").Color(Colors.red).Append(" Los datos del día anterior se borraran.").Popall @@ -186,8 +194,8 @@ Sub B4XPage_CloseRequest As ResumableSub p_mesa.Visible = False p_mesas.Visible = True LlenaMesas(Null, Null) - Else - B4XPages.ShowPage("Login") + Else if p_transparenteResumen.Visible Then + p_transparenteResumen.Visible = False End If Return False End Sub @@ -656,7 +664,7 @@ Sub llenaHistorial lv_historial.Clear lv_historial.Visible = True Do While rs_hist.NextRow -' cs.Initialize + cs.Initialize Dim Label1 As Label Label1 = lv_historial.TwoLinesLayout.Label Label1.TextSize = 16 @@ -959,8 +967,29 @@ Private Sub b_cierraAdmin_LongClick ToastMessageShow("¡Cierre administrativo cancelado!", False) End Sub -Private Sub b_cierreTotal_Click - +Private Sub b_cierreTotal_Click + Log("click") + sv_resumen.Panel.Height = p_resumen.Height + cs.Initialize + Log(l_resumen.text) + Private c As Cursor = Starter.skmt.ExecQuery("select PE_MESA, PE_TIPO, sum(PE_COSTO_TOT) as SUBTOT from PEDIDO group by PE_MESA, pe_tipo order by PE_MESA, PE_TIPO desc") + If c.RowCount > 0 Then + c.Position = 0 + Private mesaAnt As String = "" + Private tipo As String +' Private texoResumen As String + For i = 0 To c.RowCount - 1 + c.Position = i + If c.GetString("PE_TIPO") = "TARJETA" Then tipo = "Tarjeta " Else tipo = "Efectivo " + If mesaAnt <> c.GetString("PE_MESA") Then cs.Color(Colors.red).Append("Mesa " & c.GetString("PE_MESA") & CRLF).pop + cs.Append($"* ${tipo} $${NumberFormat2(c.GetString("SUBTOT"), 0, 2, 2, True)}${CRLF}"$).Popall + mesaAnt = c.GetString("PE_MESA") + Next + l_resumen.Text = cs + l_resumen.Height = su.MeasureMultilineTextHeight(l_resumen, l_resumen.Text) + sv_resumen.Panel.Height = l_resumen.Height + End If + Subs.panelVisible(p_transparenteResumen, 0, 0) End Sub Private Sub et_inicioDia_EnterPressed @@ -974,4 +1003,8 @@ End Sub Private Sub p_transparenteCierreAdmin_Click 'Para evitar que el clic en pantalla no se siga hacia atras +End Sub + +Private Sub p_transparenteResumen_Click + End Sub \ No newline at end of file diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index 7838caf..73c542b 100644 Binary files a/B4A/Files/principal.bal and b/B4A/Files/principal.bal differ diff --git a/B4A/Files/resumencont.bal b/B4A/Files/resumencont.bal new file mode 100644 index 0000000..088bae6 Binary files /dev/null and b/B4A/Files/resumencont.bal differ diff --git a/B4A/MarketPlace.b4a b/B4A/MarketPlace.b4a index 4964fa9..778fcd9 100644 --- a/B4A/MarketPlace.b4a +++ b/B4A/MarketPlace.b4a @@ -4,8 +4,9 @@ File10=mesasItem.bal File11=principal.bal File12=proditem.bal File13=proditemCarrito.bal -File14=usuario.png -File15=vecteezy_white-diagonal-stripes-with-red-line-isolated-on-white.png +File14=resumenCont.bal +File15=usuario.png +File16=vecteezy_white-diagonal-stripes-with-red-line-isolated-on-white.png File2=durakelo.png File3=engrane.png File4=engranes.png @@ -21,6 +22,7 @@ FileGroup12=Default Group FileGroup13=Default Group FileGroup14=Default Group FileGroup15=Default Group +FileGroup16=Default Group FileGroup2=Default Group FileGroup3=Default Group FileGroup4=Default Group @@ -54,7 +56,7 @@ Module3=DBRequestManager Module4=errorManager Module5=Starter Module6=Subs -NumberOfFiles=15 +NumberOfFiles=16 NumberOfLibraries=17 NumberOfModules=6 Version=12.8 diff --git a/B4A/MarketPlace.b4a.meta b/B4A/MarketPlace.b4a.meta index df86e32..d5b8ead 100644 --- a/B4A/MarketPlace.b4a.meta +++ b/B4A/MarketPlace.b4a.meta @@ -14,11 +14,11 @@ ModuleBreakpoints5= ModuleBreakpoints6= ModuleClosedNodes0= ModuleClosedNodes1= -ModuleClosedNodes2=11,12,13,14,23,24,25,27,28,29,30,31 +ModuleClosedNodes2=11,12,13,14,24,25,27,28,29,30,31,32,33,34,35 ModuleClosedNodes3= ModuleClosedNodes4= ModuleClosedNodes5= ModuleClosedNodes6=68 -NavigationStack=C_Principal,B4XPage_CloseRequest,181,0,C_Principal,b_prodMenos_Click,220,0,C_Principal,b_prodMas_Click,263,0,C_Principal,cuentaProds,292,0,C_Principal,LlenaProdsLL,385,0,C_Principal,lv_promos_ItemClick,623,0,C_Principal,p_carrito_Click,631,0,C_Principal,b_terminar_Click,641,0,C_Principal,llenaHistorial,674,0,C_Principal,LlenaMesas,802,0 +NavigationStack=C_Principal,Class_Globals,76,4,B4XMainPage,B4XPage_Created,63,0,Visual Designer,login.bal,-100,2,C_Principal,llenaHistorial,654,2,C_Principal,p_transparenteResumen_Click,975,0,C_Principal,et_inicioDia_EnterPressed,977,0,C_Principal,b_pagoCerrar_Click,922,0,Visual Designer,resumenCont.bal,-100,6,Visual Designer,principal.bal,-100,6,C_Principal,b_cierreTotal_Click,983,6 SelectedBuild=0 VisibleModules=1,5,6,2,4,3