diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 8ff2ea3..0a34b60 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -363,8 +363,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) Wait For MES_StorageAvailable End If End If - - + ' Log("Permisos BT: " & rp.Check("android.permission.BLUETOOTH_CONNECT")) ' Log("REVISAMOS PERMISOS DE BT") ' rp.CheckAndRequest("android.permission.BLUETOOTH_CONNECT") @@ -376,6 +375,10 @@ Private Sub B4XPage_Created (Root1 As B4XView) End Sub Sub B4XPage_Appear + If MES1.IsInitialized Then + LogColor(MES1.HasPermission, Colors.Magenta) + If MES1.HasPermission Then kh.revisaSiExisteRespaldo + End If kh.RD_Init kh.SetButtonTintList(cb_geocerca, Colors.LightGray, Colors.RGB(43, 154, 211)) kh.SetButtonTintList(cb_cartaPorte, Colors.LightGray, Colors.RGB(43, 154, 211)) @@ -490,7 +493,7 @@ Sub JobDone(Job As HttpJob) Log("JOBDONE MAINPAGE") If Job.Tag.As(String).StartsWith("_KMS_") Then Job.tag = Job.Tag.As(String).SubString(16) If Job.Success = False Then - LogColor("Error: " & Job.tag & " : " & Job.ErrorMessage, Colors.red) + LogColor("Error: " & Job.tag & " : " & Subs.parseHTTPError(Job.ErrorMessage), Colors.red) ToastMessageShow("Error: " & Job.ErrorMessage, True) Else ' If logger Then LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.Green) 'Mod por CHV - 211110 diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 94c6416..e124e2f 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -3836,6 +3836,7 @@ Sub revisaPromoEspecial As Map ' If clienteImpreso = "0" Then Log("El cliente no tiene venta impresa.") x.Close 'Revisamos que tenga asignada la promo. + x=Starter.skmt.ExecQuery("select count(*) as clienteConPromo, CPM_PROID, CPM_CANT, CPM_RANGO, CPM_DESC, CPM_IDPROMO, CPM_MONTO from CAT_PROMO_MONTO where CPM_CLIENTE in (Select CUENTA from cuentaa)") If x.RowCount > 0 Then x.Position = 0 @@ -3876,7 +3877,7 @@ Sub metePromoEspecial(idProd As String, idPromo As String, cantProd As Int, nomb query = "cat_gunaprod" If Starter.tipov = "VENTA" Then query = "cat_gunaprod2" ' Falta nombre de producto en el insert - Starter.skmt.ExecNonQuery2("DELETE from PEDIDO where PE_CEDIS = ?", Array As String (idPromo)) + Starter.skmt.ExecNonQuery2("DELETE from PEDIDO where PE_CEDIS = ?", Array As String (idPromo)) ' HAY QUE AGREGAR EL CLIENTE PARA QUE NO BORRE TODAS LAS PROMOS!! 'Metemos encabezado de la promo. Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_CEDIS, PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_CLIENTE, PE_FECHA, PE_USUARIO, PE_RUTA, PE_TIPO, PE_PRECIO2) VALUES(?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object (idPromo, 0, 0, cantProd, promoDescr, idPromo, idCliente, sDate & sTime, idUsuario, idRuta, Starter.tipov, 0)) 'Metemos el producto de regalo. @@ -4101,7 +4102,7 @@ Sub JobDone(Job As HttpJob) Log("JOBDONE CLIENTE") If Job.Success = False Then ' ToastMessageShow("Error: " & Job.ErrorMessage, True) - LogColor("Error: " & Job.tag & " : " & Job.ErrorMessage, Colors.red) + LogColor("Error: " & Job.tag & " : " & Subs.parseHTTPError(Job.ErrorMessage), Colors.red) ' LogColor("Error: " & Job.ErrorMessage, Colors.red) Else LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.Green) 'Mod por CHV - 211110 diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 00927c4..d135c7e 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -986,7 +986,7 @@ Sub JobDone(Job As HttpJob) Log("JOBDONE PRINCIPAL") reqManager.trackNext(Job) If Not(Job.Success) Then - LogColor("Error: " & Job.tag & " : " & Job.ErrorMessage, Colors.red) + LogColor("Error: " & Job.tag & " : " & Subs.parseHTTPError(Job.ErrorMessage), Colors.red) If Job.Tag = "version" Then Starter.errorConnDBReq = True connecta.TextColor = Colors.red diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index cd02fb9..3efbdee 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -161,6 +161,7 @@ End Sub 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage. Sub B4XPage_Appear + Log("Entro: " & entro) ' Log($"LIMITE ABORDO: ${limiteAbordo}"$) ' clv_prods_ll.Initialize(Me, "clv_prods_ll") ' list_prodsPedido.Initialize @@ -493,7 +494,7 @@ Private Sub B4XPage_CloseRequest As ResumableSub else If entro = "4" Then entro = "3" B4XPage_Appear - Return True +' Return True Else If entro = "3" Then Subs.iniciaActividad("Cliente") ' B4XPages.ShowPage("Cliente") @@ -503,6 +504,7 @@ Private Sub B4XPage_CloseRequest As ResumableSub ' B4XPages.ShowPage("Cliente") Return False End If + Return False End Sub Sub b_QR_Click diff --git a/B4A/C_Promos.bas b/B4A/C_Promos.bas index d15c745..c3d7407 100644 --- a/B4A/C_Promos.bas +++ b/B4A/C_Promos.bas @@ -66,6 +66,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) End Sub Sub B4XPage_Appear + B4XPages.MainPage.productos.entro = 3 ' LogColor(B4XPages.MainPage.productos.prodsMap, Colors.blue) prodsIds.Initialize prodsCants.Initialize diff --git a/B4A/KelloggsV4.b4a b/B4A/KelloggsV4.b4a index 5dad5d6..baac710 100644 --- a/B4A/KelloggsV4.b4a +++ b/B4A/KelloggsV4.b4a @@ -887,7 +887,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Kelloggs Venta #VersionCode: 3000 - #VersionName: 4.10.15 + #VersionName: 4.10.19 #SupportedOrientations: portrait #CanInstallToExternalStorage: False #BridgeLogger:true diff --git a/B4A/KelloggsV4.b4a.meta b/B4A/KelloggsV4.b4a.meta index e30d95c..85355e2 100644 --- a/B4A/KelloggsV4.b4a.meta +++ b/B4A/KelloggsV4.b4a.meta @@ -61,11 +61,11 @@ ModuleBreakpoints7= ModuleBreakpoints8= ModuleBreakpoints9= ModuleClosedNodes0= -ModuleClosedNodes1=2 +ModuleClosedNodes1= ModuleClosedNodes10= ModuleClosedNodes11=3,25 -ModuleClosedNodes12= -ModuleClosedNodes13= +ModuleClosedNodes12=3,5,6,7,8,9 +ModuleClosedNodes13=1 ModuleClosedNodes14= ModuleClosedNodes15= ModuleClosedNodes16= @@ -91,6 +91,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Starter,Process_Globals,49,6,ManageExternalStorage,RaiseEvent,47,0,C_Principal,connecta_Click,2151,0,C_Principal,B4XPage_Appear,519,0,Subs,GUID,1878,0,B4XMainPage,B4XPage_Appear,371,0,B4XMainPage,B4XPage_Created,338,6,kms_helperSubs,motivoNoVisitaActivo,1212,0,Subs,generaGUID_EnExterno,1881,2,kms_helperSubs,RD_Init,46,0 +NavigationStack=kms_helperSubs,RD_respaldoBatch,461,0,B4XMainPage,b_cargaLocalOk_Click,760,0,Starter,Process_Globals,42,1,B4XMainPage,Class_Globals,90,0,kms_helperSubs,Initialize,41,0,kms_helperSubs,agregaColumna,522,0,kms_helperSubs,revisaSiExisteRespaldo,87,2,kms_helperSubs,RD_Init,81,6,B4XMainPage,B4XPage_Appear,372,6,B4XMainPage,B4XPage_Created,362,4 SelectedBuild=0 -VisibleModules=1,28,11,3,29,12,4,13,23,26,24 +VisibleModules=1,28,11,3,29,12,4,13,23,7 diff --git a/B4A/Starter.bas b/B4A/Starter.bas index 34e35e8..54a373e 100644 --- a/B4A/Starter.bas +++ b/B4A/Starter.bas @@ -46,7 +46,7 @@ Sub Process_Globals Dim ultimaActualizacionGPS As String = 235959 ' Dim fechaRuta As String 'ignore Dim tiempos As Map - Dim Logger As Boolean = False + Dim Logger As Boolean = True Dim ultimaActividad As String = "" Dim boleta As String = 0 Dim sesion As Map diff --git a/B4A/Subs.bas b/B4A/Subs.bas index da0e208..365f9c6 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -1019,7 +1019,7 @@ Sub traePromo(promo As String, cliente As String) As Map ' 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}' and HCCP_CLIENTE = '${cliente}'"$) ' Log($"select * from HIST_CLIENTE_CANT_PROMOS where HCCP_PROMO = '${promo}'"$) - Log($"PROMOS SEGMENTADAS DISPONIBLES: ${ps.RowCount}"$) + If thisLog Then Log($"PROMOS SEGMENTADAS DISPONIBLES: ${ps.RowCount}"$) 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. @@ -1349,7 +1349,7 @@ End Sub 'regresa el maximo por productos fijos. Ej. si las promos por variables es 10, pero el maximo por 'fijos es 5, entonces regresamos 5. Sub revisaMaxPromosProdsVariablesPorInventario(pm As Map) As Int 'ignore - Private thisLog As Boolean = True + Private thisLog As Boolean = False If thisLog Then Log("======================================================") If thisLog Then Log("======================================================") Private invFijoXpromo As Map @@ -1898,4 +1898,16 @@ Sub generaGUID_EnExterno File.WriteString(File.DirRootExternal,$"/Android/kmts/GUID_${Starter.GUID}"$, "0") End If Log($"##### GUID: ${Starter.GUID} #####"$) +End Sub + +Sub parseHTTPError(error As String) As String + Private nuevoError As String = error + Private inicio As Int = error.IndexOf("