From 1c50207b86b9b7b8a3635d5026b1cdbb47ea69a2 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Fri, 19 Jul 2024 13:44:39 -0600 Subject: [PATCH] =?UTF-8?q?-=20VERSION=204.07.16=20-=20Se=20agreg=C3=B3=20?= =?UTF-8?q?el=20codigo=20de=20promociones=20segmentadas=20a=20"Subs.traePr?= =?UTF-8?q?omo".=20-=20Se=20cambi=C3=B3=20el=20tama=C3=B1o=20de=20las=20et?= =?UTF-8?q?iquetas=20de=20"lv=5Fpromos"=20para=20que=20no=20se=20amontone?= =?UTF-8?q?=20el=20texto.=20-=20Se=20cambi=C3=B3=20el=20tama=C3=B1o=20y=20?= =?UTF-8?q?posicion=20de=20"lv=5Fpromos"=20para=20que=20quede=20mas=20cent?= =?UTF-8?q?rado.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B4A/C_Productos.bas | 8 ++++---- B4A/Files/productos.bal | Bin 16315 -> 16315 bytes B4A/Mariana.b4a | 2 +- B4A/Mariana.b4a.meta | 4 ++-- B4A/Subs.bas | 23 +++++++++++++++++++++++ 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index cfed931..dd7cd5d 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -223,13 +223,13 @@ Sub lv_catalogos_ItemClick (Position As Int, Value As Object) lfila.text = "PROMOCIONES" lv_catalogos.Visible = False lv_promos.Clear - lv_promos.TwoLinesLayout.ItemHeight =80dip - Dim label1 As Label + Dim label1 As B4XView label1 = lv_promos.TwoLinesLayout.Label - label1.Height = 50dip label1.TextSize = 15 label1.TextColor = Colors.Black - label1.Gravity = 3 + label1.SetTextAlignment("CENTER", "LEFT") + lv_promos.TwoLinesLayout.ItemHeight = 60dip + label1.Height = 40dip Dim label2 As Label label2 = lv_promos.TwoLinesLayout.SecondLabel label2.Top = label1.Height diff --git a/B4A/Files/productos.bal b/B4A/Files/productos.bal index 07ad2d63ecdbb7734716d1d434e8542c41f52473..a2a2910e23c1c47965fdaff0552d3f94782b429b 100644 GIT binary patch delta 27 jcmdm8zq@|JA(hEL^n@n=QRQS>!ZkGxg`t> delta 16 Ycmdm8zq@|JA(hDvLe`uAs_c^j07zU1*8l(j diff --git a/B4A/Mariana.b4a b/B4A/Mariana.b4a index 4567d81..5d3b4ab 100644 --- a/B4A/Mariana.b4a +++ b/B4A/Mariana.b4a @@ -1093,7 +1093,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Mariana #VersionCode: 1 - #VersionName: 4.06.01 + #VersionName: 4.07.16 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/Mariana.b4a.meta b/B4A/Mariana.b4a.meta index 40f9fb2..4fc1eb8 100644 --- a/B4A/Mariana.b4a.meta +++ b/B4A/Mariana.b4a.meta @@ -82,6 +82,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Subs,traeAlmacen,691,0,Diseñador Visual,cliente.bal,-100,1,Diseñador Visual,clientes.bal,-100,6,C_Productos,lv_catalogos_ItemClick,228,6,C_Productos,b_terminar1_Click,592,3,C_Principal,Subir_Click,516,0,C_Principal,connecta_Click,1838,0,C_Subs,CreateNotification,463,0,C_Subs,notiLowReturn,486,0,C_Principal,B4XPage_Appear,432,0,B4XMainPage,B4XPage_Created,211,0 +NavigationStack=C_Principal,Subir_Click,516,0,C_Principal,connecta_Click,1838,0,C_Subs,CreateNotification,463,0,C_Subs,notiLowReturn,486,0,C_Principal,B4XPage_Appear,432,0,B4XMainPage,B4XPage_Created,211,0,Subs,getPhnId,19,0,Subs,traePromo,847,0,Visual Designer,productos.bal,-100,1,C_Productos,lv_catalogos_ItemClick,230,6,C_Principal,Class_Globals,0,0 SelectedBuild=0 -VisibleModules=2,12,4,5,6,26,10,16,8,13,9,17 +VisibleModules=2,12,4,5,6,26,10,16,8,13 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index b44d730..2edc4fd 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -814,6 +814,7 @@ End Sub ' resultado="OK" 'Ok si existe la promocion. ' prodsVariablesRequeridos=5} 'Cantidad de productos variables requeridos para la promoción. Sub traePromo(promo As String, cliente As String) As Map + Private thisLog As Boolean = True Private inicioContador As String = DateTime.Now Private c As Cursor = Starter.skmt.ExecQuery("Select * from promos_comp where cat_pa_id = '"& promo&"'") 'Obtenemos las el maximo de promocioones a otorgar. Private siHistorico As String = 0 @@ -826,7 +827,29 @@ Sub traePromo(promo As String, cliente As String) As Map prodsVariables.Initialize prodsVariablesPrecios.Initialize c.Position = 0 + promoMap = CreateMap("id":promo, "maxXcliente":0, "maxRecurrente":0, "maxPromos":0) 'Ponemos el DEFAULT en CERO. MOD by CHV 11/jul/24 If c.RowCount > 0 Then promoMap = CreateMap("id":promo, "maxXcliente":c.GetString("CAT_PA_MAXPROMCLIE"), "maxRecurrente":c.GetString("CAT_PA_MAXPROMREC"), "maxPromos":c.GetString("CAT_PA_MAXPROM")) + '######### PROMOCIONES SEGMENTADAS ########## +' Si la promo esta en la lista, SOLO los clientes que la tengan la pueden ver. + Private ps As Cursor = Starter.skmt.ExecQuery($"select * from HIST_CLIENTE_CANT_PROMOS where HCCP_PROMO = '${promo}'"$) +' Log($"select * from HIST_CLIENTE_CANT_PROMOS where HCCP_PROMO = '${promo}'"$) + If ps.RowCount > 0 Then LogColor($"ES PROMO SEGMENTADA"$, Colors.red) Else LogColor($"NO ES PROMO SEGMENTADA"$, Colors.red) + If ps.RowCount > 0 Then + ps.Position = 0 + promoMap = CreateMap("id":promo, "maxXcliente":0, "maxRecurrente":0, "maxPromos":0) 'Si es segmentada la ponemos en cero, porque SOLO le debe de aparecer a ciertos clientes. + If thisLog Then Log($">>> PROMO "${promo}" SEGMENTADA PARA EL CLIENTE ${ps.GetString("HCCP_CLIENTE")}"$) +' Select hccp_cliente As valido from HIST_CLIENTE_CANT_PROMOS where HCCP_PROMO = '${promo}' and HCCP_CLIENTE = '${traecliente}' + Private ps2 As Cursor = Starter.skmt.ExecQuery($"Select *, ifnull(HCCP_CANT_VENDIDA, 0) as HCCP_CANT_VENDIDA from HIST_CLIENTE_CANT_PROMOS where HCCP_PROMO = '${promo}' and HCCP_CLIENTE = '${cliente}' and HCCP_CANT > ifnull(HCCP_CANT_VENDIDA, 0)"$) +' Log($"Select * from HIST_CLIENTE_CANT_PROMOS where HCCP_PROMO = '${promo}' and HCCP_CLIENTE = '${traeCliente}' and HCCP_CANT > HCCP_CANT_VENDIDA"$) +' Log($"registros:${ps2.RowCount}"$) + If ps2.RowCount > 0 Then + ps2.Position = 0 + If thisLog Then Log($"registros:${ps2.RowCount}, cliente: ${ps2.GetString("HCCP_CLIENTE")} cant:${ps2.GetString("HCCP_CANT")}"$) + promoMap = CreateMap("id":promo, "maxXcliente":(ps2.GetString("HCCP_CANT")-ps2.GetString("HCCP_CANT_VENDIDA")), "maxRecurrente":ps2.GetString("HCCP_CANT"), "maxPromos":ps2.GetString("HCCP_CANT")) 'Si es segmentada SOLO le aparece a ciertos clientes. + End If + End If + If thisLog Then Log(promoMap) +' ########## TERMINA PROMOS SEGMENTADAS ########## c = Starter.skmt.ExecQuery("Select count(*) as hist from HIST_PROMOS where HP_CLIENTE = '"& cliente & "' and HP_CODIGO_PROMOCION = '" & promo & "'") 'Revisamos si hay historico de la promoción. c.Position = 0 If c.GetString("hist") > 0 Then siHistorico = 1