diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index ff375a2..01bf938 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -887,7 +887,7 @@ End Sub Sub i_engrane_Click lv_server.Clear ime.HideKeyboard - lv_server.AddSingleLine("http://keymon.lat:1781") + lv_server.AddSingleLine("http://keymon.net:1781") ' lv_server.AddSingleLine("http://keymon.lat:1781") If user.Text = "KMTS1" Then lv_server.AddSingleLine("http://10.0.0.205:1781") ' lv_server.AddSingleLine("http://40.123.36.38:1782") diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 5d181ce..1505a6a 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -451,7 +451,7 @@ Sub B4XPage_Appear pnlBtnCobranza.Visible = False Else p_b_tabulador.Visible = True - pnlBtnCobranza.Visible = True + pnlBtnCobranza.Visible = False f=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info") f.Position=0 l_ruta.Text = f.GetString("CAT_CL_RUTA") diff --git a/B4A/MARQUEZ.b4a b/B4A/MARQUEZ.b4a index 8fb0c9e..7287119 100644 --- a/B4A/MARQUEZ.b4a +++ b/B4A/MARQUEZ.b4a @@ -206,12 +206,12 @@ Module9=C_Nota NumberOfFiles=69 NumberOfLibraries=33 NumberOfModules=31 -Version=13.1 +Version=12.8 @EndOfDesignText@ #Region Project Attributes #ApplicationLabel: Marquez #VersionCode: 1 - #VersionName: 5.06.04 + #VersionName: 5.06.10 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/MARQUEZ.b4a.meta b/B4A/MARQUEZ.b4a.meta index 9bd51e8..38f9cba 100644 --- a/B4A/MARQUEZ.b4a.meta +++ b/B4A/MARQUEZ.b4a.meta @@ -94,6 +94,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Main,Activity_ActionBarHomeClick,37,0,Main,Create_Menu,56,0,B4XMainPage,i_engrane_Click,883,0,C_Nota,Class_Globals,0,0,C_Nota,B4XPage_Appear,124,0,C_Nota,ListView1_ItemLongClick,302,0,C_Nota,borra_Click,296,0,C_Principal,Class_Globals,0,0,C_Principal,B4XPage_Appear,556,0,C_NoVenta,Class_Globals,0,0,C_NoVenta,GUARDA_Click,108,0 +NavigationStack=Starter,Process_Globals,17,0,C_Productos,B4XPage_Appear,140,0,Subs,traeTablaProds,1565,0,Subs,traeMaxPromos,1184,6,C_NoVenta,GUARDA_Click,108,0,Diseñador Visual,principal.bal,-100,1,C_Principal,B4XPage_Appear,420,1,C_Cliente,Class_Globals,147,0,C_Cliente,GPS_LocationChanged,526,0,C_Principal,JobDone,2238,0,C_Principal,cargar_Click,1183,0 SelectedBuild=0 VisibleModules=1,2,13,4,5,7,8,9,10,14 diff --git a/B4A/Starter.bas b/B4A/Starter.bas index de24709..b026ac0 100644 --- a/B4A/Starter.bas +++ b/B4A/Starter.bas @@ -20,7 +20,8 @@ Sub Process_Globals Public FLP As FusedLocationProvider ' Private flpStarted As Boolean Dim reqManager As DBRequestManager - Dim DBReqServer As String = "http://187.189.244.154:1781" +' Dim DBReqServer As String = "http://187.189.244.154:1781" + Dim DBReqServer As String = "http://keymon.net:1781" ' Dim DBReqServer As String = "http://11.0.0.107:1781" ' Dim DBReqServer As String = "http://10.0.0.205:1783" ' Dim DBReqServer As String = "http://192.168.100.10:1781" diff --git a/B4A/Subs.bas b/B4A/Subs.bas index a29312c..23120fd 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -1188,21 +1188,27 @@ Sub traeMaxPromos(pm As Map) As Int Dim totalActual As Float = 0 Dim maxPromosXCreditoDisponible As Int 'Traemos el total del pedido actual. - Dim fg As Cursor = Starter.skmt.ExecQuery("Select IFNULL(sum(PE_COSTO_TOT),0) AS TOT_ACTUAL FROM PEDIDO WHERE PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA) AND PE_FOLIO = 'PREVENTA_CREDITO'") - fg.Position = 0 - totalActual = fg.GetString("TOT_ACTUAL") - 'Calculamos el credito que tenemos disponible. - Dim creditoDisponible As Float = creditoOtorgado - totalActual - 'Calculamos las promos disponibles deacuerdo a lo que nos alcanza con el credito disponible. - maxPromosXCreditoDisponible = creditoDisponible / precioPromo - Log("Maximo de promos disponibles: " & maxPromosXCreditoDisponible) - Log((fg.GetString("TOT_ACTUAL")) & " Monto Actual<-------") - If fg.GetString("TOT_ACTUAL") + precioPromo > creditoOtorgado Then - maxPromosXCreditoDisponible = 0 + If B4XPages.MainPage.tipo_venta = "PREVENTA_CREDITO" Then + Dim checacredito As Cursor = Starter.skmt.ExecQuery("Select CAT_CL_BCREDITO FROM kmt_info where CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") + checacredito.Position = 0 + If checacredito.GetString("CAT_CL_BCREDITO") = "1" Then + Dim fg As Cursor = Starter.skmt.ExecQuery("Select IFNULL(sum(PE_COSTO_TOT),0) AS TOT_ACTUAL FROM PEDIDO WHERE PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA) AND PE_FOLIO = 'PREVENTA_CREDITO'") + fg.Position = 0 + totalActual = fg.GetString("TOT_ACTUAL") + 'Calculamos el credito que tenemos disponible. + Dim creditoDisponible As Float = creditoOtorgado - totalActual + 'Calculamos las promos disponibles deacuerdo a lo que nos alcanza con el credito disponible. + maxPromosXCreditoDisponible = creditoDisponible / precioPromo + Log("Maximo de promos disponibles: " & maxPromosXCreditoDisponible) + Log((fg.GetString("TOT_ACTUAL")) & " Monto Actual<-------") + If fg.GetString("TOT_ACTUAL") + precioPromo > creditoOtorgado Then + Log("PENDEJADAS DE ISAAC") + maxPromosXCreditoDisponible = 0 + End If + maxPromos.Add(maxPromosXCreditoDisponible.As(String)) 'Agregamos Maxpromos X Credito Disponible + End If + Log(maxPromos) End If - maxPromos.Add(maxPromosXCreditoDisponible.As(String)) 'Agregamos Maxpromos X Credito Disponible - - maxPromos.Sort(True) ' Log($"|${pm.Get("id").As(String).trim}|${traeCliente.Trim}|"$)