diff --git a/B4A/KelloggsV4.b4a b/B4A/KelloggsV4.b4a index b9b5854..d781908 100644 --- a/B4A/KelloggsV4.b4a +++ b/B4A/KelloggsV4.b4a @@ -870,7 +870,7 @@ Version=12.5 #Region Project Attributes #ApplicationLabel: Kelloggs Venta #VersionCode: 3000 - #VersionName: 4.02.02 + #VersionName: 4.02.05 #SupportedOrientations: portrait #CanInstallToExternalStorage: False #BridgeLogger:true diff --git a/B4A/KelloggsV4.b4a.meta b/B4A/KelloggsV4.b4a.meta index 8b0a165..6c3eae9 100644 --- a/B4A/KelloggsV4.b4a.meta +++ b/B4A/KelloggsV4.b4a.meta @@ -91,6 +91,6 @@ ModuleClosedNodes6= ModuleClosedNodes7=3,11,12 ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_TicketsDia,B4XPage_Appear,56,0,C_TicketsDia,b_noventa_Click,109,0,kms_helperSubs,Class_Globals,0,0,C_Productos,clv_prods_ll_VisibleRangeChanged,1159,0,kms_helperSubs,traeDescXSku,1044,6,kms_helperSubs,traeDescXTipo,1030,0,Starter,Process_Globals,42,0,Starter,Service_Start,84,0,C_Productos,LlenaProdsLL,1286,6,B4XMainPage,Initialize,118,0,B4XMainPage,Class_Globals,110,0 +NavigationStack=Subs,traeCliente,834,0,C_Productos,clv_prods_ll_VisibleRangeChanged,1159,0,kms_helperSubs,traeDescXSku,1044,6,kms_helperSubs,traeDescXTipo,1030,0,Starter,Process_Globals,42,0,Starter,Service_Start,84,0,C_Productos,LlenaProdsLL,1286,6,B4XMainPage,Initialize,118,0,B4XMainPage,Class_Globals,110,0,Subs,traePromo,981,6 SelectedBuild=0 -VisibleModules=1,28,11,24,3,12,4,29,13,14,7,15 +VisibleModules=1,28,11,24,3,12,4,29,13,14 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 3634edc..58b15b3 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -975,6 +975,17 @@ Sub traePromo(promo As String, cliente As String) As Map c.Position = 0 promoMap = CreateMap("id":promo, "maxXcliente":0, "maxRecurrente":0, "maxPromos":0) 'Ponemos el DEFAULT en CERO. 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}'"$) + 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 aparece a ciertos clientes. + Log(">>> SEGMENTADA -> " & promo) + If traeCliente = ps.GetString("HCCP_CLIENTE") Then + promoMap = CreateMap("id":promo, "maxXcliente":ps.GetString("HCCP_CANT"), "maxRecurrente":0, "maxPromos":ps.GetString("HCCP_CANT")) 'Si es segmentada SOLO le aparece a ciertos clientes. + End If + End If + '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 @@ -985,7 +996,7 @@ Sub traePromo(promo As String, cliente As String) As Map Private prods, tipos As Map prods.Initialize tipos.Initialize - For i=0 To c.RowCount -1 + For i = 0 To c.RowCount -1 c.Position=i prods.Put(c.GetString("CAT_DP_IDPROD"), CreateMap("idProducto":c.GetString("CAT_DP_IDPROD"), "precioSimptos":c.GetString("CAT_DP_PRECIO_SIMPTOS"), "precio":c.GetString("CAT_DP_PRECIO"), "tipo":c.GetString("CAT_DP_TIPO"), "piezas":c.GetString("CAT_DP_PZAS"), "regalo":c.GetString("CAT_DP_REGALO"), "clasif":c.GetString("CAT_DP_CLASIF"))) tipos.Put(c.GetString("CAT_DP_IDPROD"), c.GetString("CAT_DP_TIPO"))