mirror of
https://github.com/KeymonSoft/Lanterna_H.git
synced 2026-04-21 14:49:16 +00:00
- VERSION 4.07.08
- Cambios visuales en algunas pantallas. - Se agregó que se puedan modificar los montos y formas de pago de las mesas en la pantalla de "Resumen Día" con clic largo. - Se agregó que se pueda actualizar la aplicación directamente desde el engrane. - Se agregó una columna a la base de datos para ordenar los grupos del "Resumen de grupos". - Se cambió el código de como se cualculan los descuentos para evitar que haya diferencias de pesos en el calculo de propinas. - Se hicieron cambios en el código para evitar que se sumen mal las propinas y los totales de Amex, Mifel y propinas cuadren con las terminales.
This commit is contained in:
Jose Alberto Guerra Ugalde
BIN
Files/login.bal
BIN
Files/login.bal
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -70,23 +70,25 @@ Library6=javaobject
|
||||
Library7=json
|
||||
Library8=okhttputils2
|
||||
Library9=preoptimizedclv
|
||||
ManifestCode='This code will be applied to the manifest file during compilation.~\n~'You do not need to modify it in most cases.~\n~'See this link for for more information: https://www.b4x.com/forum/showthread.php?p=78136~\n~AddManifestText(~\n~<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33"/>~\n~<supports-screens android:largeScreens="true" ~\n~ android:normalScreens="true" ~\n~ android:smallScreens="true" ~\n~ android:anyDensity="true"/>)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~CreateResourceFromFile(Macro, Themes.LightTheme)~\n~'End of default text.~\n~~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~AddPermission(android.permission.BLUETOOTH_ADVERTISE)~\n~AddPermission(android.permission.BLUETOOTH_CONNECT)~\n~AddPermission(android.permission.BLUETOOTH_SCAN)~\n~SetApplicationAttribute(android:largeHeap, "true")~\n~SetApplicationAttribute(android:allowBackup, "false")~\n~SetApplicationAttribute(android:exported, "true")~\n~~\n~AddApplicationText(<provider android:name="android.support.v4.content.FileProvider"~\n~ android:authorities="$PACKAGE$.provider" android:exported="false"~\n~ android:grantUriPermissions="true"><meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/provider_paths"/>~\n~ </provider>)~\n~CreateResource(xml, provider_paths,~\n~ <paths><external-files-path name="name" path="" /><files-path name="name" path="" /><files-path name="name" path="shared" /></paths>~\n~)~\n~~\n~ 'Para que se registre para abrir bases de datos~\n~ AddActivityText(main,~\n~<intent-filter>~\n~<action android:name="android.intent.action.VIEW" />~\n~<category android:name="android.intent.category.DEFAULT" />~\n~<data android:pathPattern=".*\\.db" />~\n~<data android:mimeType="*/*" />~\n~</intent-filter>)~\n~~\n~'AddActivityText(main,~\n~'<intent-filter>~\n~'<action android:name="android.intent.action.VIEW" />~\n~'<category android:name="android.intent.category.BROWSABLE" />~\n~'<category android:name="android.intent.category.DEFAULT" />~\n~'<data android:scheme="http" />~\n~'<data android:host="*" />~\n~'<data android:pathPattern=".*\\.db" />~\n~'<data android:mimeType="*/*" />~\n~'</intent-filter>)
|
||||
Module1=DBRequestManager
|
||||
Module2=errorManager
|
||||
Module3=EscPosPrinter
|
||||
Module4=numeroATexto
|
||||
Module5=Principal
|
||||
Module6=Starter
|
||||
Module7=Subs
|
||||
ManifestCode='This code will be applied to the manifest file during compilation.~\n~'You do not need to modify it in most cases.~\n~'See this link for for more information: https://www.b4x.com/forum/showthread.php?p=78136~\n~AddManifestText(~\n~<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33"/>~\n~<supports-screens android:largeScreens="true" ~\n~ android:normalScreens="true" ~\n~ android:smallScreens="true" ~\n~ android:anyDensity="true"/>)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~CreateResourceFromFile(Macro, Themes.LightTheme)~\n~'End of default text.~\n~~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~AddPermission(android.permission.BLUETOOTH_ADVERTISE)~\n~AddPermission(android.permission.BLUETOOTH_CONNECT)~\n~AddPermission(android.permission.BLUETOOTH_SCAN)~\n~SetApplicationAttribute(android:largeHeap, "true")~\n~SetApplicationAttribute(android:allowBackup, "false")~\n~SetApplicationAttribute(android:exported, "true")~\n~~\n~AddApplicationText(<provider android:name="android.support.v4.content.FileProvider"~\n~ android:authorities="$PACKAGE$.provider" android:exported="false"~\n~ android:grantUriPermissions="true"><meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/provider_paths"/>~\n~ </provider>)~\n~CreateResource(xml, provider_paths,~\n~ <paths><external-files-path name="name" path="" /><files-path name="name" path="" /><files-path name="name" path="shared" /></paths>~\n~)~\n~~\n~ 'Para que se registre para abrir bases de datos~\n~ AddActivityText(main,~\n~<intent-filter>~\n~<action android:name="android.intent.action.VIEW" />~\n~<category android:name="android.intent.category.DEFAULT" />~\n~<data android:pathPattern=".*\\.db" />~\n~<data android:mimeType="*/*" />~\n~</intent-filter>)~\n~~\n~~\n~'APP UPDATING~\n~AddActivityText(main,~\n~<intent-filter>~\n~<action android:name="android.intent.action.VIEW" />~\n~<category android:name="android.intent.category.BROWSABLE" />~\n~<category android:name="android.intent.category.DEFAULT" />~\n~<data android:scheme="http" />~\n~<data android:host="*" />~\n~<data android:pathPattern=".*\\.db" />~\n~<data android:mimeType="*/*" />~\n~</intent-filter>)~\n~AddManifestText(<uses-permission~\n~ android:name="android.permission.WRITE_EXTERNAL_STORAGE"~\n~ android:maxSdkVersion="18" />~\n~)~\n~AddApplicationText(~\n~ <provider~\n~ android:name="android.support.v4.content.FileProvider"~\n~ android:authorities="$PACKAGE$.provider"~\n~ android:exported="false"~\n~ android:grantUriPermissions="true">~\n~ <meta-data~\n~ android:name="android.support.FILE_PROVIDER_PATHS"~\n~ android:resource="@xml/provider_paths"/>~\n~ </provider>~\n~)~\n~CreateResource(xml, provider_paths,~\n~<paths>~\n~ <external-files-path name="name" path="" />~\n~ <files-path name="name" path="" />~\n~ <files-path name="name" path="shared" />~\n~</paths>~\n~)~\n~AddPermission(android.permission.REQUEST_INSTALL_PACKAGES)~\n~AddPermission(android.permission.INTERNET)~\n~AddPermission(android.permission.INSTALL_PACKAGES)~\n~AddPermission(android.permission.READ_EXTERNAL_STORAGE)~\n~AddPermission(android.permission.WRITE_EXTERNAL_STORAGE)~\n~AddPermission(android.permission.READ_PHONE_STATE)~\n~AddPermission(android.permission.WAKE_LOCK)
|
||||
Module1=appUpdater
|
||||
Module2=DBRequestManager
|
||||
Module3=errorManager
|
||||
Module4=EscPosPrinter
|
||||
Module5=numeroATexto
|
||||
Module6=Principal
|
||||
Module7=Starter
|
||||
Module8=Subs
|
||||
Module9=updateAvailable
|
||||
NumberOfFiles=26
|
||||
NumberOfLibraries=18
|
||||
NumberOfModules=7
|
||||
NumberOfModules=9
|
||||
Version=12.8
|
||||
@EndOfDesignText@
|
||||
#Region Project Attributes
|
||||
#ApplicationLabel: Lanterna
|
||||
#VersionCode: 1
|
||||
#VersionName: 4.06.27
|
||||
#VersionName: 4.07.08
|
||||
'SupportedOrientations possible values: unspecified, landscape or portrait.
|
||||
#SupportedOrientations: landscape
|
||||
#CanInstallToExternalStorage: False
|
||||
@@ -146,6 +148,7 @@ Sub Globals
|
||||
Dim intentUsado As Boolean = False
|
||||
Private cb_importarDesdeWA As CheckBox
|
||||
Dim habilitarImportarDesdeWA As Boolean = False
|
||||
Private b_update As Button
|
||||
End Sub
|
||||
|
||||
Sub Activity_Create(FirstTime As Boolean)
|
||||
@@ -158,8 +161,9 @@ Sub Activity_Create(FirstTime As Boolean)
|
||||
Subs.agregaColumna("cat_gunaprod", "CAT_PS_DESC", "TEXT")
|
||||
Subs.agregaColumna("cat_gunaprod", "CAT_GP_FECHA", "TEXT")
|
||||
Subs.agregaColumna("cat_gunaprod", "CAT_GP_FECHA_MOD", "TEXT")
|
||||
Starter.skmt.ExecNonQuery("delete from cuentaa")
|
||||
Starter.skmt.ExecNonQuery("insert into cuentaa (cuenta) values ('123456')")
|
||||
Subs.agregaColumna("cat_gunaprod", "CAT_GP_ORDEN_GRUPOS", "TEXT")
|
||||
' Starter.skmt.ExecNonQuery("delete from cuentaa")
|
||||
' Starter.skmt.ExecNonQuery("insert into cuentaa (cuenta) values ('123456')")
|
||||
Starter.skmt.ExecNonQuery("delete from cat_almacen")
|
||||
Starter.skmt.ExecNonQuery("insert into cat_almacen (id_almacen) values ('1')")
|
||||
l_version.Text = Application.VersionName
|
||||
@@ -184,6 +188,10 @@ Sub Activity_Create(FirstTime As Boolean)
|
||||
End Sub
|
||||
|
||||
Sub Activity_Resume
|
||||
If Starter.muestraProgreso = 1 Then
|
||||
muestraProgreso("Descargando actualización")
|
||||
Starter.muestraProgreso = 0
|
||||
End If
|
||||
Private z As ResultSet = Starter.skmt.ExecQuery2("select * from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As String ("IMPRESION_ACTIVA"))
|
||||
Do While z.NextRow
|
||||
Private ia As Boolean = False
|
||||
@@ -195,7 +203,6 @@ Sub Activity_Resume
|
||||
importaBDDesdeWhatsApp
|
||||
End Sub
|
||||
|
||||
|
||||
Sub Activity_KeyPress (key As Int) As Boolean
|
||||
' BACK key pressed
|
||||
If key=KeyCodes.KEYCODE_BACK Then
|
||||
@@ -210,8 +217,6 @@ Sub Activity_KeyPress (key As Int) As Boolean
|
||||
End If
|
||||
Return True
|
||||
' Returning False signals the system to handle the key
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
Sub Activity_Pause (UserClosed As Boolean)
|
||||
@@ -343,11 +348,13 @@ Sub JobDone(Job As HttpJob)
|
||||
Dim CAT_GP_TIPO As String = records(result.Columns.Get("CAT_GP_TIPO"))
|
||||
Dim CAT_GP_TIPO2 As String = records(result.Columns.Get("CAT_GP_TIPO2"))
|
||||
Dim CAT_GP_ORDENAMIENTO As Int = records(result.Columns.Get("CAT_GP_ORDENAMIENTO"))
|
||||
Starter.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD, CAT_GP_CLASIF, CAT_GP_TIPO, CAT_GP_TIPO2, CAT_GP_ORDENAMIENTO) VALUES (?,?,?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD,CAT_GP_CLASIF,CAT_GP_TIPO,CAT_GP_TIPO2,CAT_GP_ORDENAMIENTO))
|
||||
Dim CAT_GP_ORDEN_GRUPOS As Int = records(result.Columns.Get("CAT_GP_ORDEN_GRUPOS"))
|
||||
Log($"${CAT_GP_NOMBRE}, ${CAT_GP_TIPO2}"$)
|
||||
Starter.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD, CAT_GP_CLASIF, CAT_GP_TIPO, CAT_GP_TIPO2, CAT_GP_ORDENAMIENTO,CAT_GP_ORDEN_GRUPOS) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD,CAT_GP_CLASIF,CAT_GP_TIPO,CAT_GP_TIPO2,CAT_GP_ORDENAMIENTO,CAT_GP_ORDEN_GRUPOS))
|
||||
Next
|
||||
For v = 1 To 20 'Agregamos productos varios (editables)
|
||||
Starter.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD, CAT_GP_CLASIF, CAT_GP_TIPO, CAT_GP_TIPO2) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object ($"AVAR${NumberFormat2(v, 2, 0, 0, False)}"$,$"Alimentos Varios ${NumberFormat2(v, 2, 0, 0, False)}"$,"1","10000",Null,"2024-02-04 17:00:00","2024-02-04 17:00:00","VARIOS","ALIMENTOS","ALIMENTOS"))
|
||||
Starter.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD, CAT_GP_CLASIF, CAT_GP_TIPO, CAT_GP_TIPO2) VALUES (?,?,?,?,?,?,?,?,?,?)", Array As Object ($"VVAR${NumberFormat2(v, 2, 0, 0, False)}"$,$"Bebidas Varias ${NumberFormat2(v, 2, 0, 0, False)}"$,"1","10000",Null,"2024-02-04 17:00:00","2024-02-04 17:00:00","VARIOS","VINOS Y LICORES","VINOS Y LICORES"))
|
||||
Starter.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD, CAT_GP_CLASIF, CAT_GP_TIPO, CAT_GP_TIPO2,CAT_GP_ORDEN_GRUPOS) VALUES (?,?,?,?,?,?,?,?,?,?,?)", Array As Object ($"AVAR${NumberFormat2(v, 2, 0, 0, False)}"$,$"Alimentos Varios ${NumberFormat2(v, 2, 0, 0, False)}"$,"1","10000",Null,"2024-02-04 17:00:00","2024-02-04 17:00:00","VARIOS","ALIMENTOS","ALIMENTOS","1"))
|
||||
Starter.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_PRECIO,CAT_GP_ALMACEN,CAT_GP_IMG,CAT_GP_FECHA,CAT_GP_FECHA_MOD, CAT_GP_CLASIF, CAT_GP_TIPO, CAT_GP_TIPO2,CAT_GP_ORDEN_GRUPOS) VALUES (?,?,?,?,?,?,?,?,?,?,?)", Array As Object ($"VVAR${NumberFormat2(v, 2, 0, 0, False)}"$,$"Bebidas Varias ${NumberFormat2(v, 2, 0, 0, False)}"$,"1","10000",Null,"2024-02-04 17:00:00","2024-02-04 17:00:00","VARIOS","VINOS Y LICORES","BEBIDAS","8"))
|
||||
Next
|
||||
Starter.skmt.TransactionSuccessful 'Si no se pone TransactionSuccessful no se escribe NADA!!
|
||||
Starter.skmt.EndTransaction
|
||||
@@ -422,8 +429,8 @@ Private Sub b_reimprimirTicket_Click
|
||||
End Sub
|
||||
|
||||
Private Sub b_fix_Click
|
||||
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_NOART = '25', PT_MONTO = '4625', PT_PAGO2 = 'Visa/Mastercard Credito', PT_TARJETA = 'Visa/Mastercard Credito' where PT_TICKET = '00014' and PT_MESA = '5'"$)
|
||||
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO2 = 'Visa/Mastercard Credito' where PT_PAGO2 is null "$)
|
||||
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_NOART = '25', PT_MONTO = '4625', PT_PAGO2 = 'Mifel', PT_TARJETA = 'Mifel' where PT_TICKET = '00014' and PT_MESA = '5'"$)
|
||||
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO2 = 'Mifel' where PT_PAGO2 is null "$)
|
||||
ToastMessageShow("LISTO", True)
|
||||
End Sub
|
||||
|
||||
@@ -461,3 +468,17 @@ End Sub
|
||||
Private Sub cb_importarDesdeWA_CheckedChange(Checked As Boolean)
|
||||
If Checked Then habilitarImportarDesdeWA = True
|
||||
End Sub
|
||||
|
||||
Sub b_update_Click
|
||||
StartService(appUpdater)
|
||||
End Sub
|
||||
|
||||
'appUpdater - Mostramos el anuncio de que se esta descargando el nuevo apk
|
||||
Sub muestraProgreso(mensaje As String)
|
||||
ProgressDialogShow(mensaje)
|
||||
End Sub
|
||||
|
||||
'appUpdater - Ocultamos el anuncio de que se esta descargando el nuevo apk
|
||||
Sub ocultaProgreso
|
||||
ProgressDialogHide
|
||||
End Sub
|
||||
@@ -6,6 +6,8 @@ ModuleBookmarks4=
|
||||
ModuleBookmarks5=
|
||||
ModuleBookmarks6=
|
||||
ModuleBookmarks7=
|
||||
ModuleBookmarks8=
|
||||
ModuleBookmarks9=
|
||||
ModuleBreakpoints0=
|
||||
ModuleBreakpoints1=
|
||||
ModuleBreakpoints2=
|
||||
@@ -14,7 +16,9 @@ ModuleBreakpoints4=
|
||||
ModuleBreakpoints5=
|
||||
ModuleBreakpoints6=
|
||||
ModuleBreakpoints7=
|
||||
ModuleClosedNodes0=5
|
||||
ModuleBreakpoints8=
|
||||
ModuleBreakpoints9=
|
||||
ModuleClosedNodes0=
|
||||
ModuleClosedNodes1=
|
||||
ModuleClosedNodes2=
|
||||
ModuleClosedNodes3=
|
||||
@@ -22,6 +26,8 @@ ModuleClosedNodes4=
|
||||
ModuleClosedNodes5=
|
||||
ModuleClosedNodes6=
|
||||
ModuleClosedNodes7=
|
||||
NavigationStack=Visual Designer,login.bal,-100,3,Principal,cb_opcionEfectivo_CheckedChange,2852,0,Principal,b_abrirMesa_Click,1268,6,Principal,lv_historial_ItemClick,2861,4,Principal,b_leyendaDescuento_Click,3009,6,Main,b_envioBD_Click,184,0,Visual Designer,principal.bal,-100,6,Subs,revisaBD,205,0,Principal,b_imp2_Click,1975,0,Main,JobDone,254,0
|
||||
ModuleClosedNodes8=
|
||||
ModuleClosedNodes9=
|
||||
NavigationStack=Principal,Activity_Create,211,6,Principal,b_mesaCerrar_Click,1340,0,Main,Process_Globals,30,0,appUpdater,Process_Globals,78,6,Principal,b_pagoCerrar_Click,1464,5,Principal,p_resItem_LongClick,3881,6,Principal,b_resumen_Click,3734,3,Principal,b_cambioPagos_Click,3900,3,Visual Designer,principal.bal,-100,6,Principal,llenaHistorial,1014,0
|
||||
SelectedBuild=0
|
||||
VisibleModules=6,5,7
|
||||
VisibleModules=7,6,8
|
||||
|
||||
565
Principal.bas
565
Principal.bas
@@ -30,6 +30,7 @@ Sub Process_Globals
|
||||
Private tipoPago As String = "VENTA"
|
||||
Dim n2t As numeroATexto
|
||||
Dim n As Int
|
||||
dim pagoPropina as string
|
||||
End Sub
|
||||
|
||||
Sub Globals
|
||||
@@ -180,21 +181,34 @@ Sub Globals
|
||||
Private l_formaPago As Label
|
||||
Private l_comprobante As Label
|
||||
Private l_total As Label
|
||||
Private l_propina As Label
|
||||
Private l_propina, l_propinaPago As Label
|
||||
Private l_consumo As Label
|
||||
Private l_selMedios As Label
|
||||
Private b_cierraParcial As Button
|
||||
Private l_titResMesa As Label
|
||||
Private l_titResConsumo As Label
|
||||
Private l_titResPropina As Label
|
||||
Private l_titResPropina, l_titResPropinaPago As Label
|
||||
Private l_titResPagoTot As Label
|
||||
Private l_titResComprobante As Label
|
||||
Private l_titResFormaPago As Label
|
||||
Private b_imp3 As Button
|
||||
Private p_contScrollView As Panel
|
||||
Private p_resumenDiaTotales As Panel
|
||||
dim imprimirEfectivo as Boolean = False
|
||||
Dim imprimirEfectivo As Boolean = False
|
||||
Private l_propinaEfectivo, l_propinaAmex, l_propinaTDD, l_propinaTDC, l_propinaTotal, l_consumoEfectivo, l_consumoAmex, l_consumoTDC, l_consumoTDD, l_consumoTotal, l_totalEfectivo, l_totalAmex, l_totalTDD, l_totalTDC, l_totalTotal As Label
|
||||
Private l_titPropinaPago As Label
|
||||
Private p_transparenteCambioPagos As Panel
|
||||
Private b_cambioPagos As Button
|
||||
Private p_cambioPagos As Panel
|
||||
Private cb_nuevoPago As B4XComboBox
|
||||
Private cb_nuevoPagoPropina As B4XComboBox
|
||||
Dim cambioPago, cambioPagoPropina As String
|
||||
Private l_mesa0 As Label
|
||||
Private b_reimprimirTicket As Button
|
||||
Private p_selBuscar As Panel
|
||||
Private b_prevPagina As Button
|
||||
Private et_nuevoPago As EditText
|
||||
Private et_nuevoPagoPropina As EditText
|
||||
End Sub
|
||||
|
||||
Sub Activity_Create(FirstTime As Boolean)
|
||||
@@ -250,14 +264,12 @@ Sub Activity_Create(FirstTime As Boolean)
|
||||
Subs.centraEtiqueta(l_pago, p_pago.Width)
|
||||
Subs.centraEtiqueta(l_tituloHistorial, Activity.Width)
|
||||
Subs.centraPanel(p_propina, p_pago.Width)
|
||||
' Subs.centraBoton(b_pagoCerrar, p_pago.Width)
|
||||
Subs.centraPanel(p_botonesCerrar, p_pago.Width)
|
||||
' Subs.centraPanel(p_botonesCerrar, p_pago.Width)
|
||||
Subs.centraBoton(b_pagoCerrar, p_pago.Width)
|
||||
p_contProductos.Width = Activity.Width - p_contProductos.Left - 10dip
|
||||
p_contProductos.Height = Activity.Height - (p_mesaAbierta.Top + 1) - (WobbleMenu1.Height - 10dip) '165dip - 90dip
|
||||
|
||||
' Log($"${Activity.Height} - ${p_mesaAbierta.Top + 1} - ${(WobbleMenu1.Height - 10dip)}"$) ' - 90dip
|
||||
' Log($"${Activity.Height - (p_mesaAbierta.Top + 1) - (WobbleMenu1.Height - 10dip)}"$) '- 90dip
|
||||
|
||||
p_productos1.Width = p_contProductos.Width - 30dip : p_productos1.height = p_contProductos.height - 60dip
|
||||
p_productos2.Width = p_productos1.Width : p_productos2.Height = p_productos1.Height
|
||||
p_productos3.Width = p_productos1.Width : p_productos3.Height = p_productos1.Height
|
||||
@@ -270,6 +282,19 @@ Sub Activity_Create(FirstTime As Boolean)
|
||||
Subs.centraPanel(p_pago, p_mesaAbierta.Width)
|
||||
Subs.centraBoton(b_abrirMesa, Activity.Width)
|
||||
p_botonesProds.Top = clv_orden.AsView.top + clv_orden.AsView.Height + 1dip ' - b_mesaCerrar.Height
|
||||
'Esto para cambiar los tamaños y posiciones para pantallas chicas (celuar).
|
||||
If GetDeviceLayoutValues.ApproximateScreenSize < 6 Then
|
||||
p_botonesProds.Top = clv_orden.AsView.Height + clv_orden.AsView.top - 15dip
|
||||
p_botonesProds.BringToFront
|
||||
l_selMedios.Width = l_selMedios.Width * 0.7
|
||||
p_selBuscar.Left = l_selMedios.Width + l_selMedios.left
|
||||
p_selBuscar.Width = 90dip
|
||||
l_selMedios.Left = l_selVinos.Left + l_selVinos.Width
|
||||
' b_prevPagina.Width = b_prevPagina.Width * 0.85
|
||||
b_prevPagina.Left = p_selBuscar.Left + p_selBuscar.Width
|
||||
l_panelEnUso.left = b_prevPagina.Left + b_prevPagina.Width
|
||||
b_sigPagina.left = l_panelEnUso.Left + l_panelEnUso.Width
|
||||
End If
|
||||
' Subs.centraPanel(p_botonesProds, p_mesaAbierta.Width)
|
||||
Subs.centraPanel(p_mesaCampos, Activity.Width)
|
||||
Subs.centraPanel(p_mesaAbierta, Activity.Width)
|
||||
@@ -285,7 +310,7 @@ Sub Activity_Create(FirstTime As Boolean)
|
||||
Subs.panelVisible(p_mesas, 0, 0)
|
||||
cb_comensales.SetItems(Array As String(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20))
|
||||
' cb_pago.SetItems(Array As String("American Express", "Visa/Mastercard", "Efectivo"))
|
||||
cb_pagoPropina.SetItems(Array As String("Tarjeta", "Efectivo"))
|
||||
cb_pagoPropina.SetItems(Array As String("Amex", "Mifel", "Efectivo"))
|
||||
cb_mesero.SetItems(Subs.traeMeserosLista)
|
||||
' Private lasCats As List = Subs.traeCategorias
|
||||
Starter.nivelActual = "Cats"
|
||||
@@ -296,6 +321,8 @@ Sub Activity_Create(FirstTime As Boolean)
|
||||
Private Label1 As Label = lv_categorias.SingleLineLayout.Label
|
||||
Label1.TextSize = 9dip
|
||||
Label1.TextColor = Colors.Black
|
||||
cb_nuevoPago.SetItems(Array As String("Amex", "Mifel", "Efectivo"))
|
||||
cb_nuevoPagoPropina.SetItems(Array As String("Amex", "Mifel", "Efectivo"))
|
||||
muestraCats
|
||||
Log("################# PERMISOS BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
|
||||
Log("Permisos BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
|
||||
@@ -304,6 +331,14 @@ Sub Activity_Create(FirstTime As Boolean)
|
||||
Wait For Activity_PermissionResult (Permission As String, Result As Boolean)
|
||||
If Result Then Log("Tenemos permisos de bluetooth.")
|
||||
Log($"Resultado del CheckAndRequest: ${Result}"$)
|
||||
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_TARJETA = 'Mifel' where PT_TARJETA like '%Visa%'"$)
|
||||
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO_PROPINA = 'Mifel' where PT_TARJETA like '%Visa%'"$)
|
||||
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO2 = 'Mifel' where PT_TARJETA like '%Visa%'"$)
|
||||
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO2 = 'Mifel' where PT_PAGO2 like '%Visa%'"$)
|
||||
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_TARJETA = 'Amex' where PT_TARJETA like '%American%'"$)
|
||||
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO_PROPINA = 'Amex' where PT_TARJETA like '%American%'"$)
|
||||
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO2 = 'Amex' where PT_TARJETA like '%American%'"$)
|
||||
Starter.skmt.ExecNonQuery($"update pedido_ticket set PT_PAGO2 = 'Amex' where PT_PAGO2 like '%American%'"$)
|
||||
End Sub
|
||||
|
||||
Sub l_prods_Click
|
||||
@@ -454,7 +489,9 @@ End Sub
|
||||
Sub Activity_KeyPress (key As Int) As Boolean
|
||||
' BACK key pressed
|
||||
If key=KeyCodes.KEYCODE_BACK Then
|
||||
If p_resumenDia.Visible Then
|
||||
If p_transparenteCambioPagos.Visible Then
|
||||
p_transparenteCambioPagos.Visible = False
|
||||
Else If p_resumenDia.Visible Then
|
||||
p_resumenDia.Visible = False
|
||||
else If p_prevBusqueda.Visible Then
|
||||
p_prevBusqueda.Visible = False
|
||||
@@ -1004,18 +1041,16 @@ Sub llenaHistorial
|
||||
fecha = fecha.SubString2(1,10)
|
||||
Private pt As String = ""
|
||||
|
||||
If rs_hist.GetString("pt") = "Visa/Mastercard Credito" Or rs_hist.GetString("pt") = "Visa/Mastercard Debito" Then
|
||||
If rs_hist.GetString("pt") = "Mifel" Or rs_hist.GetString("pt") = "Visa/Mastercard Debito" Then
|
||||
pt = "Mifel"
|
||||
Else if rs_hist.GetString("pt") = "American Express" Then
|
||||
Else if rs_hist.GetString("pt") = "Amex" Then
|
||||
pt = "Amex"
|
||||
else if rs_hist.GetString("pt") = "Efectivo" Then
|
||||
pt = "Efectivo"
|
||||
Else
|
||||
pt = rs_hist.GetString("pt")
|
||||
End If
|
||||
|
||||
Private co As String = rs_hist.GetString("PT_COMENSALES")
|
||||
|
||||
lv_historial.AddTwoLines2(cs.Color(elColor).Append("Orden: " & rs_hist.GetString("PT_TICKET") & " - Mesa: " & rs_hist.GetString("PT_MESA") & " - " & pt & " - C:" & co).PopAll, $"Fecha: ${fecha}, Productos: ${rs_hist.GetString("PT_NOART")}, Total: $${NumberFormat2(rs_hist.GetString("PT_MONTO"), 1, 2, 2, True)}"$, $"${rs_hist.GetString("PT_MESA")}|${rs_hist.GetString("PT_TICKET")}|${rs_hist.GetString("PT_PAGO")}|${rs_hist.GetString("PT_MESERO")}|${rs_hist.GetString("PT_COMENSALES")}|-|${rs_hist.GetString("PT_ORIGEN")}"$)
|
||||
Loop
|
||||
Else
|
||||
@@ -1181,7 +1216,7 @@ Private Sub p_mesasItem_Click
|
||||
Starter.ticketActual = m.Get("ticket")
|
||||
Starter.comensalesActuales = m.Get("comensales")
|
||||
Starter.totalActual = m.Get("subtotal")
|
||||
l_mesa.Text = $"MESA ${Starter.mesaActual}"$
|
||||
l_mesa0.Text = $"MESA ${Starter.mesaActual}"$
|
||||
cb_opcionEfectivo.Checked = False
|
||||
cb_mostrarDescuento.Checked = False
|
||||
cb_opcionEfectivo_CheckedChange(False)
|
||||
@@ -1318,7 +1353,14 @@ Private Sub b_mesaCerrar_Click
|
||||
cb_opcionEfectivo.Checked = False
|
||||
p_formasDePago.Height = 40dip
|
||||
p_propina.Top = 143dip
|
||||
p_botonesCerrar.Top = 295dip ' 295dip
|
||||
'Esto para cambiar los tamaños y posiciones para pantallas chicas (celuar).
|
||||
If GetDeviceLayoutValues.ApproximateScreenSize < 6 Then
|
||||
b_pagoCerrar.Top = 235dip ' 295dip
|
||||
b_pagoCerrar.Left = 20dip
|
||||
b_pagoCerrar.BringToFront
|
||||
Else
|
||||
b_pagoCerrar.Top = 295dip ' 295dip
|
||||
End If
|
||||
p_pago.Height = 390dip
|
||||
p_formasDePago.RemoveAllViews
|
||||
Private c As Cursor = Starter.skmt.ExecQuery($"select PE_MESA from PEDIDO where PE_MESA = '${Starter.mesaActual}' and PE_TIPO = 'VENTA'"$)
|
||||
@@ -1339,6 +1381,9 @@ Private Sub b_mesaCerrar_Click
|
||||
Starter.skmt.ExecNonQuery($"update CAT_MESAS set M_PAGO = null, M_TICKET = null, M_ESTATUS = null, M_MESERO = null, M_COMENSALES = null where M_ID = '${Starter.mesaActual}'"$)
|
||||
Activity_KeyPress(KeyCodes.KEYCODE_BACK)
|
||||
End If
|
||||
pagoPropina = "Amex"
|
||||
cb_pagoPropina.SelectedIndex = 0
|
||||
cb_pago2.SelectedIndex = 0
|
||||
End Sub
|
||||
|
||||
Private Sub b_mesaEditar_Click
|
||||
@@ -1424,11 +1469,11 @@ Private Sub b_pagoCerrar_Click
|
||||
End If
|
||||
Private sigTicket As String = Subs.traeConsecutivoTicket("CERRADA", tipoPago)
|
||||
LogColor($"${primeraVez} - ${tipoPago} - |${formaPago}|"$, Colors.Red)
|
||||
If tipoPago = "TARJETA" Then 'primeraVez And
|
||||
Private laPropina As String = "0"
|
||||
If et_propina.Text <> "" Then
|
||||
laPropina = et_propina.Text
|
||||
End If
|
||||
If tipoPago = "TARJETA" Then 'primeraVez And
|
||||
Log("INSERTAMOS TARJETA")
|
||||
Log($"${listaFormaDePago.Get(fdp)}"$)
|
||||
Private pa As ResultSet = Starter.skmt.ExecQuery($"select * from PEDIDO where PE_MESA = '${Starter.mesaActual}' and PE_TICKET = '${sigTicketMT}' and PE_TIPO = 'MULTI-TICKET'"$)
|
||||
@@ -1442,21 +1487,23 @@ Private Sub b_pagoCerrar_Click
|
||||
LogColor("INSERTAMOS TARJETA EN PT", Colors.blue)
|
||||
Private ptMonto As String = listaMontoDePago.Get(fdp).As(EditText).text
|
||||
' Private ptPropina = laPropina
|
||||
If contT > 0 Then laPropina = 0
|
||||
If fdp <> listaFormasDePagoCB.Size - 1 Then
|
||||
laPropina = 0
|
||||
pagoPropina = formaPago
|
||||
Else
|
||||
pagoPropina = cb_pagoPropina.SelectedItem
|
||||
End If
|
||||
Log($"${contT}|${laPropina}|${cb_pagoPropina.SelectedItem}|${pa.RowCount}|${ptMonto}, ${formaPago}"$)
|
||||
Starter.skmt.ExecNonQuery2("insert into PEDIDO_TICKET(PT_TICKET, PT_PAGO, PT_FECHA, PT_MESERO, PT_NOART, PT_MONTO, PT_MESA, PT_COSTO_SIN, PT_COMENSALES, PT_ALMACEN, PT_PAGO2, PT_ORIGEN, PT_PROPINA, PT_PAGO_PROPINA) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object _
|
||||
(sigTicket, tipoPago, Subs.traeFecha, Starter.meseroActual, pa.RowCount, ptMonto, Starter.mesaActual, ptMonto, Starter.comensalesActuales, "MULTI-TICKET", formaPago, $"${Starter.mesaActual}|${sigTicketMT}"$, laPropina, cb_pagoPropina.SelectedItem))
|
||||
(sigTicket, tipoPago, Subs.traeFecha, Starter.meseroActual, pa.RowCount, ptMonto, Starter.mesaActual, ptMonto, Starter.comensalesActuales, "MULTI-TICKET", formaPago, $"${Starter.mesaActual}|${sigTicketMT}"$, laPropina, pagoPropina))
|
||||
ticketX = ticketAnt
|
||||
ticketAnt = sigTicket
|
||||
pagoAnt = formaPago
|
||||
primeraVez = False
|
||||
|
||||
If contT = 0 Then
|
||||
Private descuentoTicket As String = sigTicket
|
||||
Private descuentoTipoPago As String = tipoPago
|
||||
End If
|
||||
|
||||
|
||||
Private d As ResultSet = Starter.skmt.ExecQuery($"select ifnull(sum(PE_COSTO_TOT), 0) as totalEfectivo from PEDIDO where PE_TIPO = 'EFECTIVO' and PE_ORIGEN = '${Starter.mesaActual}|${sigTicketMT}'"$)
|
||||
Private elEfectivo As String = "0"
|
||||
Do While d.NextRow
|
||||
@@ -1469,17 +1516,19 @@ Private Sub b_pagoCerrar_Click
|
||||
Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_TICKET, PE_FECHA, PE_MESERO, PE_MESA, PE_COSTO_SIN, PE_TIPO, PE_TIPO2, PE_ORIGEN) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ((elEfectivo * -1), (elEfectivo * -1), 1, "DESCUENTO", "DESC01", sigTicket, Subs.traeFecha, Starter.meseroActual, Starter.mesaActual, elEfectivo, "TARJETA", formaPago, $"${Starter.mesaActual}|${sigTicketMT}"$))
|
||||
Starter.ticketActual = ticketX
|
||||
End If
|
||||
|
||||
|
||||
contT = contT + 1
|
||||
End If
|
||||
If tipoPago = "EFECTIVO" Then
|
||||
Log("INSERTAMOS EFECTIVO")
|
||||
Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_TICKET, PE_FECHA, PE_MESERO, PE_MESA, PE_COSTO_SIN, PE_TIPO, PE_TIPO2, PE_ORIGEN) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object _
|
||||
(listaMontoDePago.Get(fdp).As(EditText).text, listaMontoDePago.Get(fdp).As(EditText).text, 1, "Consumo de alimentos", "CDA01", sigTicket, Subs.traeFecha, Starter.meseroActual, Starter.mesaActual, listaMontoDePago.Get(fdp).As(EditText).text, tipoPago, formaPago, $"${Starter.mesaActual}|${sigTicketMT}"$))
|
||||
|
||||
|
||||
Starter.skmt.ExecNonQuery2("insert into PEDIDO_TICKET(PT_TICKET, PT_PAGO, PT_FECHA, PT_MESERO, PT_NOART, PT_MONTO, PT_MESA, PT_COSTO_SIN, PT_COMENSALES, PT_ALMACEN, PT_PAGO2, PT_ORIGEN) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object(sigTicket, tipoPago, Subs.traeFecha, Starter.meseroActual, 1, listaMontoDePago.Get(fdp).As(EditText).text, Starter.mesaActual, listaMontoDePago.Get(fdp).As(EditText).text, Starter.comensalesActuales, "MULTI-TICKET", formaPago, $"${Starter.mesaActual}|${sigTicketMT}"$))
|
||||
Private laPropinaEfectivo As String = "0"
|
||||
Private pagoPropinaEfectivo As String = "Efectivo"
|
||||
If pagoPropina = "Efectivo" Then
|
||||
laPropinaEfectivo = laPropina
|
||||
pagoPropinaEfectivo = pagoPropina
|
||||
End If
|
||||
Starter.skmt.ExecNonQuery2("insert into PEDIDO_TICKET(PT_TICKET, PT_PAGO, PT_FECHA, PT_MESERO, PT_NOART, PT_MONTO, PT_MESA, PT_COSTO_SIN, PT_COMENSALES, PT_ALMACEN, PT_PAGO2, PT_ORIGEN, PT_PROPINA, PT_PAGO_PROPINA) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object(sigTicket, tipoPago, Subs.traeFecha, Starter.meseroActual, 1, listaMontoDePago.Get(fdp).As(EditText).text, Starter.mesaActual, listaMontoDePago.Get(fdp).As(EditText).text, Starter.comensalesActuales, "MULTI-TICKET", formaPago, $"${Starter.mesaActual}|${sigTicketMT}"$, laPropinaEfectivo, pagoPropinaEfectivo))
|
||||
Log("INSERTAMOS EFECTIVO EN PT")
|
||||
descXEfectivo = listaMontoDePago.Get(fdp).As(EditText).text
|
||||
End If
|
||||
@@ -1488,14 +1537,10 @@ Private Sub b_pagoCerrar_Click
|
||||
' Starter.skmt.ExecNonQuery2("INSERT INTO PEDIDO (PE_COSTO_TOT, PE_COSTOU, PE_CANT, PE_PRONOMBRE, PE_PROID, PE_TICKET, PE_FECHA, PE_MESERO, PE_MESA, PE_COSTO_SIN, PE_TIPO, PE_TIPO2, PE_ORIGEN) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?) ", Array As Object ((descXEfectivo * -1), (descXEfectivo * -1), 1, "DESCUENTO", "DESC01", ticketAnt, Subs.traeFecha, Starter.meseroActual, Starter.mesaActual, descXEfectivo, "TARJETA", pagoAnt, $"${Starter.mesaActual}|${sigTicketMT}"$)) 'Agregamos el descuento al pedido de tarjeta.
|
||||
' descuentoAplicado = True
|
||||
' End If
|
||||
|
||||
Starter.ticketActual = sigTicket
|
||||
Private tm As Map = CreateMap("ticket":sigTicket, "pago":tipoPago)
|
||||
listaTickets.Add(tm) 'Agregamos el ticket y pago a la lista para imprimir el ticket con estos datos al llamar b_imprimirTicket_Click
|
||||
|
||||
|
||||
Next
|
||||
|
||||
Private d As ResultSet = Starter.skmt.ExecQuery($"select ifnull(sum(PE_COSTO_TOT), 0) as totalEfectivo from PEDIDO where PE_TIPO = 'EFECTIVO' and PE_ORIGEN = '${Starter.mesaActual}|${sigTicketMT}'"$)
|
||||
Private elEfectivo As String = "0"
|
||||
Do While d.NextRow
|
||||
@@ -1575,6 +1620,7 @@ Private Sub b_cierreTotal_Click
|
||||
' Log("click")
|
||||
b_envioInfo.Enabled = True
|
||||
sv_resumen.Panel.Height = p_resumen.Height
|
||||
l_resumen.Width = sv_resumen.Width - 20dip
|
||||
cs.Initialize
|
||||
Log(l_resumen.text)
|
||||
Private c As Cursor = Starter.skmt.ExecQuery($"select M_ESTATUS from CAT_MESAS where M_ESTATUS = 'ABIERTA'"$)
|
||||
@@ -1600,6 +1646,7 @@ Private Sub b_cierreTotal_Click
|
||||
If mesaAnt <> c.GetString("PE_MESA") Then
|
||||
Private tm As Cursor = Starter.skmt.ExecQuery($"select sum(PT_MONTO) as totalMesa from PEDIDO_TICKET where PT_MESA = '${c.GetString("PE_MESA")}' and PT_PAGO <> 'MULTI-TICKET'"$)
|
||||
tm.Position = 0
|
||||
Log($"Mesa ${c.GetString("PE_MESA")} - $${tm.GetString("totalMesa")} ${CRLF}"$)
|
||||
cs.Color(Colors.RGB(1,127,1)).Append($"Mesa ${c.GetString("PE_MESA")} - $${NumberFormat2(tm.GetString("totalMesa"), 1, 2, 2, True)} ${CRLF}"$).pop
|
||||
Private tipoAnt As String = ""
|
||||
End If
|
||||
@@ -1626,6 +1673,7 @@ End Sub
|
||||
|
||||
Private Sub b_cierraParcial_Click
|
||||
sv_resumen.Panel.Height = p_resumen.Height
|
||||
l_resumen.Width = sv_resumen.Width - 20dip
|
||||
b_envioInfo.Enabled = False
|
||||
cs.Initialize
|
||||
Log(l_resumen.text)
|
||||
@@ -1955,12 +2003,13 @@ Sub b_imp2_Click
|
||||
Private c As Cursor = Starter.skmt.ExecQuery($"select M_ESTATUS from CAT_MESAS where M_ESTATUS = 'ABIERTA'"$)
|
||||
' Log(c.RowCount)
|
||||
' If c.RowCount = 0 Then 'Si no hay mesas abiertas entonces ...
|
||||
Private c As Cursor = Starter.skmt.ExecQuery("select distinct CAT_GP_TIPO2, CAT_GP_CLASIF, PE_PRONOMBRE, sum(pe_cant) as cuantos, sum(pe_costo_tot) as monto from pedido join CAT_GUNAPROD on cat_gp_id = PE_PROID where PE_TIPO <> 'VENTA' group by CAT_GP_TIPO2, PE_PRONOMBRE order by CAT_GP_TIPO2, PE_PRONOMBRE") 'Este query quita los "Consumo de alimentos", que son los tickets que se generan con el multi-ticket, porque en CAT_GUNAPROD no existe el ID CDA01.
|
||||
Private c As Cursor = Starter.skmt.ExecQuery("select distinct PE_PRONOMBRE, PE_PROID, CAT_GP_TIPO2, CAT_GP_CLASIF, sum(pe_cant) as cuantos, sum(pe_costo_tot) as monto from pedido join CAT_GUNAPROD on cat_gp_id = PE_PROID where PE_TIPO <> 'VENTA' group by CAT_GP_TIPO2, PE_PRONOMBRE order by CAT_GP_ORDEN_GRUPOS, CAT_GP_TIPO2, PE_PRONOMBRE") 'Este query quita los "Consumo de alimentos", que son los tickets que se generan con el multi-ticket, porque en CAT_GUNAPROD no existe el ID CDA01.
|
||||
' Log(c.RowCount)
|
||||
If c.RowCount > 0 Then
|
||||
c.Position = 0
|
||||
Private catAnt As String = ""
|
||||
Private catTotal As String = 0
|
||||
Private catMontoTotal As String = 0
|
||||
If imprimirAqui Then Printer1.WriteString($"Fecha: ${sDate} ${sTime} ${CRLF}${CRLF}"$)
|
||||
Log("*** GRUPOS ***")
|
||||
cs.Color(Colors.red).Append($"*** GRUPOS ***${CRLF}"$).pop
|
||||
@@ -1974,46 +2023,63 @@ Sub b_imp2_Click
|
||||
' Private tm As Cursor = Starter.skmt.ExecQuery($"select sum(PT_MONTO) as totalMesa from PEDIDO_TICKET where PT_MESA = '${c.GetString("PE_MESA")}' and PT_PAGO <> 'MULTI-TICKET'"$)
|
||||
' tm.Position = 0
|
||||
If catAnt <> "" Then
|
||||
cs.Color(Colors.Green).Append($"Total ${catAnt}: ${catTotal}${CRLF}"$).pop
|
||||
|
||||
Private primerEspacioLargo As Int = 45 - catAnt.Length - ("xxxx".Length + 1) - 6
|
||||
Private primerEspacio As String = ""
|
||||
For n = 1 To primerEspacioLargo
|
||||
primerEspacio = primerEspacio & "."
|
||||
Next
|
||||
|
||||
cs.Color(Colors.Green).Append($"Total ${catAnt}: ${catTotal}${primerEspacio}$${NumberFormat2(catMontoTotal,1,2,2,True)}${CRLF}"$).pop
|
||||
Log($"Total ${catAnt}: ${catTotal}${primerEspacio}$${NumberFormat2(catMontoTotal,1,2,2,True)}${CRLF}"$)
|
||||
If imprimirAqui Then
|
||||
Printer1.WriteString(Printer1.BOLD)
|
||||
Printer1.WriteString($"Total ${catAnt}: ${catTotal}${CRLF}${CRLF}"$)
|
||||
Printer1.WriteString($"Total ${catAnt}: ${catTotal}${primerEspacio}$${NumberFormat2(catMontoTotal,1,2,2,True)}${CRLF}${CRLF}"$)
|
||||
Printer1.WriteString(Printer1.NOBOLD)
|
||||
End If
|
||||
' Log($">>>>>>> CAT TOTAL ${catAnt}: ${catTotal}"$ )
|
||||
End If
|
||||
cs.Color(Colors.red).Append($"++ ${c.GetString("CAT_GP_TIPO2")} ++${CRLF}"$).pop
|
||||
Log($"++ ${c.GetString("CAT_GP_TIPO2")} ++${CRLF}"$)
|
||||
LogColor($"++ ${c.GetString("CAT_GP_TIPO2")} ++${CRLF}"$, Colors.blue)
|
||||
Printer1.WriteString(Printer1.BOLD)
|
||||
If imprimirAqui Then Printer1.WriteString($"++ ${c.GetString("CAT_GP_TIPO2")} ++${CRLF}"$)
|
||||
Printer1.WriteString(Printer1.NOBOLD)
|
||||
Private tipoAnt As String = ""
|
||||
catTotal = 0
|
||||
catMontoTotal = 0
|
||||
End If
|
||||
|
||||
Private elNombre As String = c.GetString("PE_PRONOMBRE")
|
||||
If elNombre.Length > 20 Then elNombre = elNombre.SubString2(0, 20)
|
||||
Log($"${elNombre} - ${c.GetString("cuantos")}"$) '${c.Position} - ${elNombre.Length} -
|
||||
cs.Color(Colors.DarkGray).Append($"${elNombre} - ${c.GetString("cuantos")} ${CRLF}"$).pop
|
||||
' Log(cs.Length)
|
||||
If c.GetString("PE_PROID").StartsWith("LA") Then
|
||||
Private nn As ResultSet = Starter.skmt.ExecQuery($"select CAT_GP_NOMBRE from CAT_GUNAPROD where CAT_GP_ID = '${c.GetString("PE_PROID")}'"$)
|
||||
Do While nn.NextRow
|
||||
elNombre = nn.GetString("CAT_GP_NOMBRE")
|
||||
Loop
|
||||
End If
|
||||
Private monto As String = NumberFormat2(c.GetString("monto"), 1, 0, 0, True)
|
||||
Private cuantos As String = c.GetString("cuantos")
|
||||
Private nom() As String = Regex.Split("\$", elNombre)
|
||||
If nom.Length > 1 Then elNombre = nom(0)
|
||||
If elNombre.Length > 45 Then elNombre = elNombre.SubString2(0, 45)
|
||||
Log($"${elNombre} - ${c.GetString("cuantos")} .. $${monto}"$) '${c.Position} - ${elNombre.Length} -
|
||||
cs.Color(Colors.DarkGray).Append($"${elNombre} - ${c.GetString("cuantos")} .. $${monto} ${CRLF}"$).pop
|
||||
' Log(cs.Length)
|
||||
|
||||
Private primerEspacioLargo As Int = 30 - elNombre.Length - (cuantos.Length + 1) - 6
|
||||
Private primerEspacioLargo As Int = 45 - elNombre.Length - (cuantos.Length + 1) - 6
|
||||
Private primerEspacio As String = ""
|
||||
For n = 1 To primerEspacioLargo
|
||||
primerEspacio = primerEspacio & "."
|
||||
Next
|
||||
' If imprimirAqui Then Printer1.WriteString($"${elNombre}${Subs.alineaDerecha(c.GetString("cuantos"), (31 - elNombre.Length), ".")} ${CRLF}"$)
|
||||
If imprimirAqui Then Printer1.WriteString($"${elNombre}${primerEspacio}${c.GetString("cuantos")}..${monto} ${CRLF}"$)
|
||||
If imprimirAqui Then Printer1.WriteString($"${elNombre}${primerEspacio}${c.GetString("cuantos")}..$${monto} ${CRLF}"$)
|
||||
catTotal = catTotal + c.GetString("cuantos")
|
||||
catMontoTotal = catMontoTotal + c.GetString("monto")
|
||||
' Log($">>>> ${catAnt} - ${c.GetString("CAT_GP_TIPO2")}"$)
|
||||
If i = c.RowCount - 1 Then
|
||||
Log($"Total ${c.GetString("CAT_GP_TIPO2")}: ${catTotal}${CRLF}"$)
|
||||
cs.Color(Colors.Green).Append($"Total ${c.GetString("CAT_GP_TIPO2")}: ${catTotal}${CRLF}"$).pop
|
||||
Log($"Total ${c.GetString("CAT_GP_TIPO2")}: ${catTotal} ${primerEspacio}$${NumberFormat2(catMontoTotal,1,2,2,True)}${CRLF}"$)
|
||||
cs.Color(Colors.Green).Append($"Total ${c.GetString("CAT_GP_TIPO2")}: ${catTotal} ${primerEspacio}$${NumberFormat2(catMontoTotal,1,2,2,True)}${CRLF}"$).pop
|
||||
If imprimirAqui Then
|
||||
Printer1.WriteString(Printer1.BOLD)
|
||||
Printer1.WriteString($"Total ${c.GetString("CAT_GP_TIPO2")}: ${catTotal}${CRLF}"$)
|
||||
Printer1.WriteString($"Total ${c.GetString("CAT_GP_TIPO2")}: ${catTotal} ${primerEspacio}$${NumberFormat2(catMontoTotal,1,2,2,True)}${CRLF}"$)
|
||||
Printer1.WriteString(Printer1.NOBOLD)
|
||||
End If
|
||||
End If
|
||||
@@ -2031,7 +2097,7 @@ Sub b_imp2_Click
|
||||
'RESUMEN
|
||||
LogColor("sleeping ....", Colors.Magenta)
|
||||
If imprimirAqui Then Sleep(4000)
|
||||
Private rsm As Cursor = Starter.skmt.ExecQuery($"select distinct CAT_GP_TIPO2, sum(pe_cant) as cuantos, sum(pe_costo_tot) as monto from pedido join CAT_GUNAPROD on cat_gp_id = PE_PROID group by CAT_GP_TIPO2 order by CAT_GP_TIPO2"$) 'Este query quita los "Consumo de alimentos", que son los tickets que se generan con el multi-ticket, porque en CAT_GUNAPROD no existe el ID CDA01.
|
||||
Private rsm As Cursor = Starter.skmt.ExecQuery($"select distinct CAT_GP_TIPO2, sum(pe_cant) as cuantos, sum(pe_costo_tot) as monto from pedido join CAT_GUNAPROD on cat_gp_id = PE_PROID where PE_TIPO <> 'VENTA' group by CAT_GP_TIPO2 order by CAT_GP_ORDEN_GRUPOS, CAT_GP_TIPO2"$) 'Este query quita los "Consumo de alimentos", que son los tickets que se generan con el multi-ticket, porque en CAT_GUNAPROD no existe el ID CDA01.
|
||||
' Log(rsm.RowCount)
|
||||
If rsm.RowCount > 0 Then
|
||||
Printer1.WriteString(Printer1.BOLD)
|
||||
@@ -2051,9 +2117,9 @@ Sub b_imp2_Click
|
||||
For n = 1 To primerEspacioLargo
|
||||
primerEspacio = primerEspacio & "."
|
||||
Next
|
||||
If imprimirAqui Then Printer1.WriteString($"${laCat}${primerEspacio}${cuantos}..${monto} ${CRLF}"$)
|
||||
cs.Color(Colors.DarkGray).Append($"${laCat}${primerEspacio}${cuantos}..${monto} ${CRLF}"$).pop
|
||||
Log($"${laCat}${primerEspacio}${cuantos}..${monto} ${CRLF}"$)
|
||||
If imprimirAqui Then Printer1.WriteString($"${laCat}${primerEspacio}${cuantos}..$${monto} ${CRLF}"$)
|
||||
cs.Color(Colors.DarkGray).Append($"${laCat}${primerEspacio}${cuantos}..$${monto} ${CRLF}"$).pop
|
||||
Log($"${laCat}${primerEspacio}${cuantos}..$${monto} ${CRLF}"$)
|
||||
Next
|
||||
|
||||
'COMENSALES
|
||||
@@ -2070,40 +2136,71 @@ Sub b_imp2_Click
|
||||
Log($"Comensales ...........${totalComensales} ${CRLF}"$)
|
||||
|
||||
'PAGOS
|
||||
' LogColor("sleeping ....", Colors.Magenta)
|
||||
' If imprimirAqui Then Sleep(1000)
|
||||
' Private pgs As Cursor = Starter.skmt.ExecQuery($"Select PT_PAGO2, sum(PT_NOART) As arts, sum(PT_MONTO) As monto from PEDIDO_TICKET where pt_pago <> 'MULTI-TICKET' and pt_pago <> 'VENTA' group by PT_PAGO2"$)
|
||||
' Private totalComensales As Int = 0
|
||||
' If imprimirAqui Then Printer1.WriteString($"${CRLF}"$)
|
||||
' Printer1.WriteString(Printer1.BOLD)
|
||||
' If imprimirAqui Then Printer1.WriteString($"*** PAGOS *** ${CRLF}"$)
|
||||
' Printer1.WriteString(Printer1.NOBOLD)
|
||||
' cs.Color(Colors.red).Append($"** PAGOS **${CRLF}"$).pop
|
||||
' Log("*** PAGOS ***")
|
||||
' Private totalPagos As String = 0
|
||||
' For i = 0 To pgs.RowCount - 1
|
||||
' pgs.Position = i
|
||||
' Private elPago As String = pgs.GetString("PT_PAGO2")
|
||||
' If elPago.Length > 20 Then elPago = elPago.SubString2(0, 20)
|
||||
'' Log($"${pgs.Position} - ${elPago.Length} - ${elPago}"$)
|
||||
' Private monto As String = pgs.GetString("monto")
|
||||
' Private cuantos As String = pgs.GetString("arts")
|
||||
' Private primerEspacioLargo As Int = 30 - elPago.Length - (cuantos.Length + 1) - 6
|
||||
' Private primerEspacio As String = ""
|
||||
' For n = 1 To primerEspacioLargo
|
||||
' primerEspacio = primerEspacio & "."
|
||||
' Next
|
||||
'' monto = NumberFormat2(monto.As(Double), 1, 0, 0, True)
|
||||
'' Log(monto)
|
||||
' If imprimirAqui Then Printer1.WriteString($"${elPago}${primerEspacio}${cuantos}..${NumberFormat2(pgs.GetString("monto"), 1, 0, 0, True)} ${CRLF}"$)
|
||||
' cs.Color(Colors.DarkGray).Append($"${elPago}${primerEspacio}${cuantos}..${NumberFormat2(pgs.GetString("monto"), 1, 0, 0, True)} ${CRLF}"$).pop
|
||||
' Log($"${elPago}${primerEspacio}${cuantos}..${NumberFormat2(pgs.GetString("monto"), 1, 0, 0, True)} ${CRLF}"$)
|
||||
' totalPagos = totalPagos + monto
|
||||
' Next
|
||||
' totalPagos = NumberFormat2(totalPagos, 1, 0, 0, True)
|
||||
' If imprimirAqui Then Printer1.WriteString($"TOTAL PAGOS ......... ${i}..${totalPagos} ${CRLF}"$)
|
||||
' cs.Color(Colors.DarkGray).Append($"TOTAL PAGOS: .........${i}.. ${totalPagos} ${CRLF}"$).pop
|
||||
' Log($"TOTAL PAGOS: .........${i}.. ${totalPagos} ${CRLF}"$)
|
||||
LogColor("sleeping ....", Colors.Magenta)
|
||||
If imprimirAqui Then Sleep(1000)
|
||||
Private pgs As Cursor = Starter.skmt.ExecQuery($"Select PT_PAGO2, sum(PT_NOART) As arts, sum(PT_MONTO) As monto from PEDIDO_TICKET where pt_pago <> 'MULTI-TICKET' and pt_pago <> 'VENTA' group by PT_PAGO2"$)
|
||||
Private totalComensales As Int = 0
|
||||
If imprimirAqui Then Printer1.WriteString($"${CRLF}"$)
|
||||
Printer1.WriteString(Printer1.BOLD)
|
||||
If imprimirAqui Then Printer1.WriteString($"*** PAGOS *** ${CRLF}"$)
|
||||
Printer1.WriteString(Printer1.NOBOLD)
|
||||
cs.Color(Colors.red).Append($"** PAGOS **${CRLF}"$).pop
|
||||
Log("*** PAGOS ***")
|
||||
Private totalPagos As String = 0
|
||||
For i = 0 To pgs.RowCount - 1
|
||||
pgs.Position = i
|
||||
Private elPago As String = pgs.GetString("PT_PAGO2")
|
||||
If elPago.Length > 20 Then elPago = elPago.SubString2(0, 20)
|
||||
' Log($"${pgs.Position} - ${elPago.Length} - ${elPago}"$)
|
||||
Private monto As String = pgs.GetString("monto")
|
||||
Private cuantos As String = pgs.GetString("arts")
|
||||
Private primerEspacioLargo As Int = 30 - elPago.Length - (cuantos.Length + 1) - 6
|
||||
Private primerEspacio As String = ""
|
||||
For n = 1 To primerEspacioLargo
|
||||
primerEspacio = primerEspacio & "."
|
||||
Next
|
||||
' monto = NumberFormat2(monto.As(Double), 1, 0, 0, True)
|
||||
' Log(monto)
|
||||
|
||||
' Aqui se sacan las PROPINAS para sumarselas a los subtotals de cada pago.
|
||||
' Private propAmex = "0", propMifel = "0", propMifelDebito = "0", propEfectivo = "0" As String
|
||||
' Private rt As ResultSet = Starter.skmt.ExecQuery($"Select sum(pt_monto) as ptMonto, sum(pt_propina) as ptPropina, * from pedido_ticket where pt_pago <> 'VENTA' and PT_PAGO <> 'MULTI-TICKET' group by pt_pago2"$)
|
||||
' Private rtpa As ResultSet = Starter.skmt.ExecQuery($"Select ifnull(sum(pt_propina),0) as ptPropina, * from pedido_ticket where pt_pago_propina = 'Amex' group by pt_pago_propina"$)
|
||||
' Do While rtpa.NextRow
|
||||
' propAmex = rtpa.GetString("ptPropina")
|
||||
' Loop
|
||||
' Private rtpmc As ResultSet = Starter.skmt.ExecQuery($"Select ifnull(sum(pt_propina),0) as ptPropina, * from pedido_ticket where pt_pago_propina = 'Visa/Mastercard Credito' group by pt_pago_propina"$)
|
||||
' Do While rtpmc.NextRow
|
||||
' propMifel = rtpmc.GetString("ptPropina")
|
||||
' Loop
|
||||
' Private rtpmd As ResultSet = Starter.skmt.ExecQuery($"Select ifnull(sum(pt_propina),0) as ptPropina, * from pedido_ticket where pt_pago_propina = 'Visa/Mastercard Debito' group by pt_pago_propina"$)
|
||||
' Do While rtpmd.NextRow
|
||||
' propMifelDebito = rtpmd.GetString("ptPropina")
|
||||
' Loop
|
||||
' Private rtpe As ResultSet = Starter.skmt.ExecQuery($"Select ifnull(sum(pt_propina),0) as ptPropina, * from pedido_ticket where pt_pago_propina = 'Efectivo' group by pt_pago_propina"$)
|
||||
' Do While rtpe.NextRow
|
||||
' propEfectivo = rtpe.GetString("ptPropina")
|
||||
' Loop
|
||||
' If elPago = "Amex" Then
|
||||
' Log("ES AMEX")
|
||||
' monto = monto + propAmex
|
||||
' else If elPago = "Visa/Masercard Cedito" Then
|
||||
' monto = monto + propMifel
|
||||
' Log("ES MIFEL")
|
||||
' End If
|
||||
|
||||
' Log($"########## ${elPago}, ${monto}, ${propAmex}, ${propMifel} "$)
|
||||
Log(elPago)
|
||||
If elPago = "Amex" Then elPago = "Amex"
|
||||
If imprimirAqui Then Printer1.WriteString($"${elPago}${primerEspacio}..${NumberFormat2(pgs.GetString("monto"), 1, 0, 0, True)} ${CRLF}"$)
|
||||
cs.Color(Colors.DarkGray).Append($"${elPago}${primerEspacio}.. ${NumberFormat2(pgs.GetString("monto"), 1, 0, 0, True)} ${CRLF}"$).pop
|
||||
Log($"${elPago}${primerEspacio}..${NumberFormat2(pgs.GetString("monto"), 1, 0, 0, True)} ${CRLF}"$)
|
||||
totalPagos = totalPagos + monto
|
||||
Next
|
||||
totalPagos = NumberFormat2(totalPagos, 1, 0, 0, True)
|
||||
If imprimirAqui Then Printer1.WriteString($"TOTAL PAGOS ...........${totalPagos} ${CRLF}"$)
|
||||
cs.Color(Colors.DarkGray).Append($"TOTAL PAGOS: ........... ${totalPagos} ${CRLF}"$).pop
|
||||
Log($"TOTAL PAGOS: .........${i}.. ${totalPagos} ${CRLF}"$)
|
||||
|
||||
'PROPINAS
|
||||
LogColor("sleeping ....", Colors.Magenta)
|
||||
@@ -2132,6 +2229,9 @@ Sub b_imp2_Click
|
||||
If imprimirAqui Then Printer1.WriteString(CRLF)
|
||||
If imprimirAqui Then Printer1.WriteString(CRLF)
|
||||
If imprimirAqui Then Printer1.WriteString(CRLF)
|
||||
If imprimirAqui Then Printer1.WriteString(CRLF)
|
||||
If imprimirAqui Then Printer1.WriteString(CRLF)
|
||||
If imprimirAqui Then Printer1.WriteString(CRLF)
|
||||
End If
|
||||
l_resumen.Text = cs
|
||||
l_resumen.Height = su.MeasureMultilineTextHeight(l_resumen, l_resumen.Text)
|
||||
@@ -2632,7 +2732,8 @@ Private Sub b_imprimirTicket_Click
|
||||
End Sub
|
||||
|
||||
Private Sub cb_pagoPropina_SelectedIndexChanged (Index As Int)
|
||||
|
||||
pagoPropina = cb_pagoPropina.SelectedItem
|
||||
Log($"####### Cambiamos el pago de la propina a ${pagoPropina}"$)
|
||||
End Sub
|
||||
|
||||
Private Sub p_transparenteCambioMesa_Click
|
||||
@@ -2691,6 +2792,9 @@ Private Sub b_agregarPago_Click
|
||||
Starter.formasDePago = Starter.formasDePago + 1
|
||||
' Log(Starter.formasDePago)
|
||||
agregaFormaDePago(l_tipoPago.Left, (60 * (Starter.formasDePago - 1)), Starter.formasDePago, 60)
|
||||
cb_pagoPropina.SelectedIndex = 0
|
||||
pagoPropina = "Amex"
|
||||
' cb_pago2.SelectedIndex = 0
|
||||
End Sub
|
||||
|
||||
'Agrega una froma de pago al cerrar una mesa
|
||||
@@ -2716,14 +2820,15 @@ Sub agregaFormaDePago(left0 As Int, top0 As Int, tag0 As Int, brinco As Int)
|
||||
p_propina.Top = p_propina.Top + brinco
|
||||
p_formasDePago.Height = p_formasDePago.Height + brinco
|
||||
p_pago.Height = p_pago.Height + brinco
|
||||
p_botonesCerrar.Top = p_botonesCerrar.Top + brinco
|
||||
' p_botonesCerrar.Top = p_botonesCerrar.Top + brinco
|
||||
b_pagoCerrar.Top = b_pagoCerrar.Top + brinco
|
||||
End If
|
||||
l_tipoPago2.Text = $"${Starter.formasDePago}:"$
|
||||
cb_pago2.Tag = tag0
|
||||
' cb_pago2.mBase.SetTextSizeAnimated(0, 14dip)
|
||||
et_montoPago2.Tag = tag0
|
||||
cb_pago2.SetItems(Array As String("American Express", "Visa/Mastercard Credito","Visa/Mastercard Debito", "Efectivo"))
|
||||
If Starter.ticketFactura Then cb_pago2.SetItems(Array As String("American Express", "Visa/Mastercard Credito","Visa/Mastercard Debito"))
|
||||
cb_pago2.SetItems(Array As String("Amex", "Mifel", "Efectivo"))
|
||||
If Starter.ticketFactura Then cb_pago2.SetItems(Array As String("Amex", "Mifel"))
|
||||
p_num.Tag = tag0
|
||||
listaFormasDePagoCB.Add(cb_pago2)
|
||||
listaFormaDePago.Add(cb_pago2.SelectedItem)
|
||||
@@ -2734,22 +2839,30 @@ Sub agregaFormaDePago(left0 As Int, top0 As Int, tag0 As Int, brinco As Int)
|
||||
End Sub
|
||||
|
||||
Private Sub cb_pago2_SelectedIndexChanged (Index As Int)
|
||||
Log(Sender.As(B4XComboBox).tag)
|
||||
Log(Sender.As(B4XComboBox).SelectedItem)
|
||||
' Log(Sender.As(B4XComboBox).tag)
|
||||
Log("|"&Sender.As(B4XComboBox).SelectedItem&"|")
|
||||
listaFormaDePago.Set(Sender.As(B4XComboBox).tag - 1, Sender.As(B4XComboBox).SelectedItem)
|
||||
If Sender.As(B4XComboBox).SelectedItem = "Amex" Then
|
||||
cb_pagoPropina.SelectedIndex = 0
|
||||
Else If Sender.As(B4XComboBox).SelectedItem = "Mifel" Then
|
||||
cb_pagoPropina.SelectedIndex = 1
|
||||
else If Sender.As(B4XComboBox).SelectedItem = "Efectivo" Then
|
||||
cb_pagoPropina.SelectedIndex = 2
|
||||
End If
|
||||
If Sender.As(B4XComboBox).SelectedItem = "Efectivo" And listaFormaDePago.Size = 1 Then
|
||||
Private c As Cursor = Starter.skmt.ExecQuery("select * from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'DESCUENTO X EFECTIVO'")
|
||||
c.Position = 0
|
||||
l_opcionEfectivo.Text = $"${c.GetString("CAT_VA_VALOR")}% desc."$
|
||||
p_opcionEfectivo.Visible = True
|
||||
' cb_opcionEfectivo.Checked = False
|
||||
|
||||
Else
|
||||
' Log(listaFormaDePago.Size)
|
||||
p_opcionEfectivo.Visible = False
|
||||
cb_opcionEfectivo.Checked = False
|
||||
End If
|
||||
Log(listaFormaDePago)
|
||||
pagoPropina = cb_pagoPropina.SelectedItem
|
||||
' Log(listaFormaDePago)
|
||||
Log($"****** Cambiamos el pago de la propina a ${pagoPropina}"$)
|
||||
End Sub
|
||||
|
||||
Private Sub et_montoPago2_TextChanged (Old As String, New As String)
|
||||
@@ -2844,21 +2957,32 @@ Private Sub cb_opcionEfectivo_CheckedChange(Checked As Boolean)
|
||||
' Private c As ResultSet = Starter.skmt.ExecQuery($"select *, ifnull(PE_DESC, 0) as DESC from PEDIDO join cat_gunaprod on PE_PROID = CAT_GP_ID where PE_MESA = '${Starter.mesaActual}' and PE_TIPO = 'VENTA' and PE_TICKET = '${Starter.ticketActual}'"$)
|
||||
Private c As ResultSet = Starter.skmt.ExecQuery($"select *, ifnull(PE_DESC, 0) as DESC from PEDIDO join cat_gunaprod on PE_PROID = CAT_GP_ID where PE_MESA = '${Starter.mesaActual}' and PE_TIPO = '${tipoPago}' and PE_TICKET = '${Starter.ticketActual}'"$)
|
||||
' Log($"select *, ifnull(PE_DESC, 0) as DESC from PEDIDO join cat_gunaprod on PE_PROID = CAT_GP_ID where PE_MESA = '${Starter.mesaActual}' and PE_TIPO = 'VENTA' and PE_TICKET = '${Starter.ticketActual}'"$)
|
||||
Private elSubTotal As String = "0"
|
||||
Do While c.NextRow
|
||||
If c.GetString("CAT_GP_TIPO") = "ALIMENTOS" Then
|
||||
elSubTotal = elSubTotal + c.GetString("PE_COSTO_TOT") - (c.GetString("PE_COSTO_TOT") * (c.GetString("DESC") / 100))
|
||||
Else
|
||||
elSubTotal = elSubTotal + c.GetString("PE_COSTO_TOT")
|
||||
End If
|
||||
Loop
|
||||
' Private elSubTotal As String = "0"
|
||||
' Do While c.NextRow
|
||||
' If c.GetString("CAT_GP_TIPO") = "ALIMENTOS" Then
|
||||
' elSubTotal = elSubTotal + c.GetString("PE_COSTO_TOT") - (c.GetString("PE_COSTO_TOT") * (c.GetString("DESC") / 100))
|
||||
' Else
|
||||
' elSubTotal = elSubTotal + c.GetString("PE_COSTO_TOT")
|
||||
' End If
|
||||
' Loop
|
||||
' LogColor($">>>>> ${elSubTotal} "$, Colors.Blue)
|
||||
Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_MONTO = '${NumberFormat2(Ceil(elSubTotal), 1, 0, 0, False)}' where PT_MESA = '${Starter.mesaActual}' and PT_TICKET = '${Starter.ticketActual}' and PT_PAGO = 'VENTA'"$)
|
||||
If et_montoPago2.IsInitialized Then et_montoPago2.Text = Subs.traeTotalTicketActual_P("VENTA")
|
||||
Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_MONTO = '${NumberFormat2(Subs.traeTotalTicketActual_P("VENTA"), 1, 0, 0, False)}' where PT_MESA = '${Starter.mesaActual}' and PT_TICKET = '${Starter.ticketActual}' and PT_PAGO = 'VENTA'"$)
|
||||
If et_montoPago2.IsInitialized Then
|
||||
et_montoPago2.Text = Subs.traeTotalTicketActual_P("VENTA")
|
||||
l_total2.Text = Subs.traeTotalTicketActual_P("VENTA")
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub lv_historial_ItemClick (Position As Int, Value As Object)
|
||||
Log(Value)
|
||||
'Esto para cambiar los tamaños y posiciones para pantallas chicas (celuar).
|
||||
If GetDeviceLayoutValues.ApproximateScreenSize < 6 Then
|
||||
lv_verOrden.Height = Activity.Height * 0.42
|
||||
b_reabrirMesa.Height = 40dip
|
||||
b_reimprimirTicket.Height = 40dip
|
||||
b_reabrirMesa.Top = lv_verOrden.top + lv_verOrden.Height + 10dip
|
||||
b_reimprimirTicket.Top = lv_verOrden.top + lv_verOrden.Height + 10dip
|
||||
End If
|
||||
Private d() As String = Regex.Split("\|", Value)
|
||||
l_verOrden.Text = $"Orden ${d(1)}"$
|
||||
Starter.mesaActual = d(0)
|
||||
@@ -3065,29 +3189,30 @@ Private Sub b_leyendaDescuento_Click
|
||||
If imprimirEste Then Printer1.PrintImage(myimage)
|
||||
If imprimirEste Then Printer1.WriteString(Printer1.UNREVERSE)
|
||||
If tipoPago <> "VENTA" Then 'Solo imprimimos los datos fiscales si es para b_pagoCerrar.
|
||||
If imprimirEste Then Printer1.WriteString("RESTAURANTE Y COCINA ITALIANA PEVEL" & CRLF)
|
||||
If logger Then Log("RESTAURANTE Y COCINA ITALIANA PEVEL" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString("RFC: RCI230918DAA " & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" RESTAURANTE Y COCINA ITALIANA PEVEL" & CRLF)
|
||||
If logger Then Log(" RESTAURANTE Y COCINA ITALIANA PEVEL" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" RFC: RCI230918DAA " & CRLF)
|
||||
If logger Then Log("RFC: RCI230918DAA" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString("REG FSC: GENERAL DE LEY DE PERSONAS MORALES" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" REG FSC: GENERAL DE LEY DE PERSONAS MORALES" & CRLF)
|
||||
If logger Then Log("REG FSC: GENERAL DE LEY DE PERSONAS MORALES" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString("DOM FSC: PASEO DE LAS PALMAS NO. 275, LOCAL B" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" DOM FSC: PASEO DE LAS PALMAS 275, LOCAL B" & CRLF)
|
||||
If logger Then Log("DOM FSC: PASEO DE LAS PALMAS NO. 275, LOCAL B" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString("EXPEDIDO EN: PASEO DE LAS PALMAS NO. 275, LOCAL B" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" EXPEDIDO EN: PASEO DE LAS PALMAS NO. 275" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" LOCAL B" & CRLF)
|
||||
If logger Then Log("EXPEDIDO EN: PASEO DE LAS PALMAS NO. 275, LOCAL B" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString("TEL: 55 5207 9969" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" TEL: 55 5207 9969" & CRLF)
|
||||
If logger Then Log("TEL: 55 5207 9969" & CRLF)
|
||||
End If
|
||||
If imprimirEste Then Printer1.WriteString("CDMX " & sDate &" " & sTime & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" CDMX " & sDate &" " & sTime & CRLF)
|
||||
If logger Then Log("CDMX " & sDate &" " & sTime & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(Printer1.BOLD)
|
||||
If imprimirEste Then Printer1.WriteString("No. Ticket: " & Starter.ticketActual & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" No. Ticket: " & Starter.ticketActual & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(Printer1.NOBOLD)
|
||||
If logger Then Log("No. Ticket: " & Starter.ticketActual & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString($"Mesero: ${Starter.meseroActual}${Subs.rellenaHasta(15 - Starter.meseroActual.Length)}${Printer1.BOLD} # Mesa${CRLF}"$)
|
||||
If imprimirEste Then Printer1.WriteString($" Mesero: ${Starter.meseroActual}${Subs.rellenaHasta(15 - Starter.meseroActual.Length)}${Printer1.BOLD} # Mesa${CRLF}"$)
|
||||
If logger Then Log($"Mesero: ${Starter.meseroActual}${Subs.rellenaHasta(15 - Starter.meseroActual.Length)} # Mesa${CRLF}"$)
|
||||
If imprimirEste Then Printer1.WriteString(Printer1.NOBOLD)
|
||||
If imprimirEste Then Printer1.WriteString($"Comensales: ${Starter.comensalesActuales}${Subs.rellenaHasta(14 - Starter.mesaActual.Length)}${Printer1.BOLD} ${Starter.mesaActual}${CRLF}"$)
|
||||
If imprimirEste Then Printer1.WriteString($" Comensales: ${Starter.comensalesActuales}${Subs.rellenaHasta(14 - Starter.mesaActual.Length)}${Printer1.BOLD} ${Starter.mesaActual}${CRLF}"$)
|
||||
If logger Then Log($"Comensales: ${Starter.comensalesActuales}${Subs.rellenaHasta(14 - Starter.mesaActual.Length)}${Starter.mesaActual}${CRLF}"$)
|
||||
If imprimirEste Then Printer1.WriteString(" " & CRLF)
|
||||
c = Starter.skmt.ExecQuery($"select *, ifnull(PE_DESC, 0) as DESC from PEDIDO join cat_gunaprod on PE_PROID = CAT_GP_ID where PE_MESA = '${Starter.mesaActual}' and PE_TIPO = '${tipoPago}' and PE_TICKET = '${Starter.ticketActual}'"$)
|
||||
@@ -3102,7 +3227,7 @@ Private Sub b_leyendaDescuento_Click
|
||||
c.Position = i
|
||||
Private elNombre As String = c.GetString("PE_PRONOMBRE")
|
||||
elPU = c.GetString("PE_COSTOU")
|
||||
If elNombre.Length > 30 Then elNombre.SubString2(0, 30)
|
||||
If elNombre.Length > 45 Then elNombre.SubString2(0, 45)
|
||||
If c.GetString("CAT_GP_TIPO") = "ALIMENTOS" Then
|
||||
' Log($">> APLICAMOS DESC POR ALIMENTOS"$)
|
||||
Private elSubTIndividual As String = c.GetString("PE_COSTOU") - (c.GetString("PE_COSTOU") * (c.GetString("DESC") / 100))
|
||||
@@ -3115,22 +3240,29 @@ Private Sub b_leyendaDescuento_Click
|
||||
Else
|
||||
elSubTotal = c.GetString("PE_COSTO_TOT")
|
||||
End If
|
||||
|
||||
|
||||
Private nom() As String = Regex.Split("\$", elNombre)
|
||||
If nom.Length > 1 Then
|
||||
elNombre = nom(0)
|
||||
End If
|
||||
|
||||
' Log($"${c.GetString("PE_PRONOMBRE")}, ${c.GetString("DESC")}${elSubTotal}"$)
|
||||
Private cantXpu As String = $"${c.GetString("PE_CANT")} x ${elPU}"$
|
||||
If imprimirEste Then Printer1.WriteString($"${c.GetString("PE_CANT")} ${elNombre}${CRLF}${cantXpu}${Subs.alineaDerecha("$"&NumberFormat2(elSubTotal, 1, 2, 2, True), (30 - cantXpu.Length), ".")}${CRLF}"$)
|
||||
Log($"${c.GetString("PE_CANT")} ${elNombre}${CRLF}${cantXpu}${Subs.alineaDerecha("$"&NumberFormat2(elSubTotal, 1, 2, 2, True), (30 - cantXpu.Length), ".")}${CRLF}"$)
|
||||
Private cantXpu As String = $" ${c.GetString("PE_CANT")} X ${elPU}"$
|
||||
If imprimirEste Then Printer1.WriteString($" ${elNombre}${CRLF}${cantXpu}${Subs.alineaDerecha("$"&NumberFormat2(elSubTotal, 1, 2, 2, True), (45 - cantXpu.Length), ".")}${CRLF}"$)
|
||||
Log($"${elNombre}${CRLF}${cantXpu}${Subs.alineaDerecha("$"&NumberFormat2(elSubTotal, 1, 2, 2, True), (30 - cantXpu.Length), ".")}${CRLF}"$)
|
||||
' elTotalSumado = elTotalSumado + elSubTotal
|
||||
If i = c.RowCount - 1 Then
|
||||
Private desc As ResultSet = Starter.skmt.ExecQuery($"select * from PEDIDO where PE_PRONOMBRE = 'DESCUENTO' and PE_MESA = '${Starter.mesaActual}' and PE_TIPO = '${tipoPago}' and PE_TICKET = '${Starter.ticketActual}'"$)
|
||||
' Log($"select * from PEDIDO where PE_PRONOMBRE = 'DESCUENTO' and PE_MESA = '${Starter.mesaActual}' and PE_TIPO = '${tipoPago}' and PE_TICKET = '${Starter.ticketActual}'"$)
|
||||
Do While desc.NextRow
|
||||
|
||||
If imprimirEste Then Printer1.WriteString($"Subtotal: ${Subs.alineaDerecha("$"&NumberFormat2( (Subs.traeTotalTicketActual_P(tipoPago)), 1, 2, 2, True), (30 - 12), ".")}${CRLF}"$)
|
||||
Log($"Subtotal: ${Subs.alineaDerecha("$"&NumberFormat2((Subs.traeTotalTicketActual_P(tipoPago)), 1, 2, 2, True), (30 - 12), ".")}${CRLF}"$)
|
||||
If imprimirEste Then Printer1.WriteString($" Subtotal: ${Subs.alineaDerecha("$"&NumberFormat2( (Subs.traeTotalTicketActual_P(tipoPago)), 1, 2, 2, True), (45 - 12), ".")}${CRLF}"$)
|
||||
Log($"Subtotal: ${Subs.alineaDerecha("$"&NumberFormat2((Subs.traeTotalTicketActual_P(tipoPago)), 1, 2, 2, True), (45 - 12), ".")}${CRLF}"$)
|
||||
|
||||
cantXpu = $"1 x ${desc.GetString("PE_COSTOU")}"$
|
||||
If imprimirEste Then Printer1.WriteString($"1 DESCUENTO${CRLF}${cantXpu}${Subs.alineaDerecha("$"&NumberFormat2(desc.GetString("PE_COSTO_TOT"), 1, 2, 2, True), (30 - cantXpu.Length), ".")}${CRLF}"$)
|
||||
Log($"1 DESCUENTO${CRLF}${cantXpu}${Subs.alineaDerecha("$"&NumberFormat2(desc.GetString("PE_COSTO_TOT"), 1, 2, 2, True), (30 - cantXpu.Length), ".")}${CRLF}"$)
|
||||
If imprimirEste Then Printer1.WriteString($" 1 DESCUENTO${CRLF}${cantXpu}${Subs.alineaDerecha("$"&NumberFormat2(desc.GetString("PE_COSTO_TOT"), 1, 2, 2, True), (45 - cantXpu.Length), ".")}${CRLF}"$)
|
||||
Log($"1 DESCUENTO${CRLF}${cantXpu}${Subs.alineaDerecha("$"&NumberFormat2(desc.GetString("PE_COSTO_TOT"), 1, 2, 2, True), (45 - cantXpu.Length), ".")}${CRLF}"$)
|
||||
Loop
|
||||
End If
|
||||
Next
|
||||
@@ -3175,48 +3307,61 @@ Private Sub b_leyendaDescuento_Click
|
||||
' elTotal = elTotal + c.GetString("PT_PROPINA")
|
||||
' End If
|
||||
If tipoPago <> "VENTA" Then
|
||||
If imprimirEste Then Printer1.WriteString($"${CRLF}IVA: $${NumberFormat2(((elTotal * 0.16)), 1, 2, 2, True)}"$)
|
||||
If imprimirEste Then Printer1.WriteString($"${CRLF} IVA: $${NumberFormat2(((elTotal * 0.16)), 1, 2, 2, True)}"$)
|
||||
If logger Then Log($"${CRLF}IVA: $${NumberFormat2(((elTotal * 0.16)), 1, 2, 2, True)}"$)
|
||||
End If
|
||||
If imprimirEste Then Printer1.WriteString($"${CRLF}Total: $${NumberFormat2(elTotal, 1, 2, 2, True)}"$)
|
||||
If imprimirEste Then Printer1.WriteString($"${CRLF} Total: $${NumberFormat2(elTotal, 1, 2, 2, True)}"$)
|
||||
If logger Then Log($"${CRLF}Total: $${NumberFormat2(elTotal, 1, 2, 2, True)}"$)
|
||||
If imprimirEste Then Printer1.WriteString($"${CRLF}${n2t.NumberToWords(NumberFormat2(elTotal, 1, 2, 2, False))}"$)
|
||||
|
||||
Private elTextoTotal As String = n2t.NumberToWords(NumberFormat2(elTotal, 1, 2, 2, False))
|
||||
If elTextoTotal.Length > 40 Then
|
||||
Private tot1 As String = elTextoTotal.SubString2(0, 40)
|
||||
Private tot2 As String = elTextoTotal.SubString(40)
|
||||
Log("xxxxxxxxxxxxxxxxx")
|
||||
If imprimirEste Then Printer1.WriteString($"${CRLF} ${tot1}"$)
|
||||
If imprimirEste Then Printer1.WriteString($"${CRLF} ${tot2}"$)
|
||||
Else
|
||||
If imprimirEste Then Printer1.WriteString($"${CRLF} ${n2t.NumberToWords(NumberFormat2(elTotal, 1, 2, 2, False))}"$)
|
||||
End If
|
||||
|
||||
|
||||
|
||||
If logger Then Log($"${CRLF}${n2t.NumberToWords(NumberFormat2(elTotal, 1, 2, 2, False))}"$)
|
||||
If tipoPago <> "VENTA" Then
|
||||
Private fPago As String = c.GetString("PT_PAGO")
|
||||
If fPago = "EFECTIVO" Then fPago = "EFEPUNTOS"
|
||||
If imprimirEste Then Printer1.WriteString($"${CRLF}Forma de pago: ${fPago}"$)
|
||||
If imprimirEste Then Printer1.WriteString($"${CRLF} Forma de pago: ${fPago}"$)
|
||||
If logger Then Log($"${CRLF}Forma de pago: ${fPago}"$)
|
||||
End If
|
||||
End If
|
||||
If imprimirEste Then Printer1.WriteString(Printer1.UNREVERSE)
|
||||
If imprimirEste Then Printer1.WriteString(Printer1.NOBOLD)
|
||||
If imprimirEste Then Printer1.WriteString(CRLF)
|
||||
If imprimirEste Then Printer1.WriteString("------------------------------" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" --------------------------------------" & CRLF)
|
||||
If logger Then Log("------------------------------" & CRLF)
|
||||
If tipoPago <> "VENTA" Then
|
||||
If imprimirEste Then Printer1.WriteString("----------- PAGADO -----------" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" --------------- PAGADO ---------------" & CRLF)
|
||||
If logger Then Log("------------ PAGADO ----------" & CRLF)
|
||||
Else
|
||||
If imprimirEste Then Printer1.WriteString("---------- NO PAGADO ---------" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" -------------- NO PAGADO -------------" & CRLF)
|
||||
If logger Then Log("---------- NO PAGADO ---------" & CRLF)
|
||||
End If
|
||||
If imprimirEste Then Printer1.WriteString("------------------------------" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" --------------------------------------" & CRLF)
|
||||
If logger Then Log("------------------------------" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString("----ESTE TICKET NO ES UN -----" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" --------ESTE TICKET NO ES UN ---------" & CRLF)
|
||||
If logger Then Log("----ESTE TICKET NO ES UN -----" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString("--COMPROBANTE FISCAL, SOLO ES-" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" ------COMPROBANTE FISCAL, SOLO ES-----" & CRLF)
|
||||
If logger Then Log("--COMPROBANTE FISCAL, SOLO ES-" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString("--------INFORMATIVO-----------" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" ------------INFORMATIVO---------------" & CRLF)
|
||||
If logger Then Log("--------INFORMATIVO-----------" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString("------------------------------" & CRLF)
|
||||
If logger Then Log("------------------------------" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" --------------------------------------" & CRLF)
|
||||
If logger Then Log("--------------------------------------" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(CRLF)
|
||||
If tipoPago = "VENTA" And cb_leyendaDescuento.Checked Then
|
||||
If imprimirEste Then Printer1.WriteString(Printer1.REVERSE)
|
||||
If imprimirEste Then Printer1.WriteString("------ 10% DE DESCUENTO ------" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString("----- PAGANDO EN EFECTIVO ----" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString("-- >> SOLO EN ALIMENTOS << ---" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" ---------- 10% DE DESCUENTO ----------" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" --------- PAGANDO EN EFECTIVO --------" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" ------ >> SOLO EN ALIMENTOS << -------" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(Printer1.UNREVERSE)
|
||||
If imprimirEste Then Printer1.WriteString(CRLF)
|
||||
If logger Then Log("------ 10% DE DESCUENTO ------" & CRLF)
|
||||
@@ -3225,11 +3370,11 @@ Private Sub b_leyendaDescuento_Click
|
||||
End If
|
||||
If cb_factura.Checked Then
|
||||
' If imprimirEste Then Printer1.WriteString(Printer1.REVERSE)
|
||||
If imprimirEste Then Printer1.WriteString("------- PARA FACTURAR -------" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString("---- INGRESAR A ESTA LIGA ----" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString("--- TIENE 3 DIAS DESDE EL ----" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString("-- MOMENTO DE LA IMPRESION --" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString("http://facturacionkmts.com.mx" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" ----------- PARA FACTURAR -----------" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" -------- INGRESAR A ESTA LIGA --------" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" ------- TIENE 3 DIAS DESDE EL --------" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" ------ MOMENTO DE LA IMPRESION ------" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(" http://facturacionkmts.com.mx" & CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(Printer1.UNREVERSE)
|
||||
If imprimirEste Then Printer1.WriteString(CRLF)
|
||||
If logger Then Log("------ PARA FACTURAR ------" & CRLF)
|
||||
@@ -3238,6 +3383,12 @@ Private Sub b_leyendaDescuento_Click
|
||||
End If
|
||||
If imprimirEste Then Printer1.WriteString(CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(CRLF)
|
||||
If imprimirEste Then Printer1.WriteString(CRLF)
|
||||
Sleep(1000)
|
||||
Printer1.DisConnect
|
||||
Catch
|
||||
@@ -3580,13 +3731,18 @@ Private Sub b_resumen_Click
|
||||
p_contScrollView.Width = clv_resumenDia.AsView.width + 2dip : p_contScrollView.height = clv_resumenDia.AsView.height + 2dip
|
||||
p_contScrollView.left = 10dip : p_contScrollView.top = 70dip
|
||||
clv_resumenDia.Base_Resize(clv_resumenDia.GetBase.Width, clv_resumenDia.GetBase.Height) 'Cambiamos el tamaño del panel interno de la lista para que se ajuste al nuevo tamaño.
|
||||
'Esto para cambiar los tamaños y posiciones para pantallas chicas (celuar).
|
||||
If GetDeviceLayoutValues.ApproximateScreenSize < 6 Then
|
||||
p_resumenDiaTotales.Top = p_contScrollView.Height + p_contScrollView.Top - 35dip : p_resumenDiaTotales.left = p_contScrollView.left
|
||||
p_resumenDiaTotales.Height = p_resumenDia.Height - p_resumenDiaTotales.top + 20dip
|
||||
Else
|
||||
p_resumenDiaTotales.Top = p_contScrollView.Height + p_contScrollView.Top + 10dip : p_resumenDiaTotales.left = p_contScrollView.left
|
||||
p_resumenDiaTotales.Height = p_resumenDia.Height - p_resumenDiaTotales.top - 10dip
|
||||
|
||||
End If
|
||||
Private n As Int = 0
|
||||
p_resumenDia.Visible = True
|
||||
clv_resumenDia.Clear
|
||||
Private o As ResultSet = Starter.skmt.ExecQuery($"select *, ifnull(PT_PROPINA, 0) as PT_PROPINA, ifnull(PT_FACTURAR, 'false') as PT_FACTURAR, ifnull(PT_PAGO2, 'PENDIENTE') as PT_PAGO2 from PEDIDO_TICKET where PT_PAGO <> 'MULTI-TICKET' order by PT_FECHA desc"$)
|
||||
Private o As ResultSet = Starter.skmt.ExecQuery($"select *, ifnull(PT_PROPINA, 0) as PT_PROPINA, ifnull(PT_PAGO_PROPINA, "") as PT_PAGO_PROPINA, ifnull(PT_FACTURAR, 'false') as PT_FACTURAR, ifnull(PT_PAGO2, 'PENDIENTE') as PT_PAGO2 from PEDIDO_TICKET where PT_PAGO <> 'MULTI-TICKET' order by PT_FECHA desc"$)
|
||||
Do While o.NextRow
|
||||
Private Pnl As B4XView = xui.CreatePanel("")
|
||||
Pnl.SetLayoutAnimated(0, 0, 0, clv_resumenDia.AsView.Width, 52dip)
|
||||
@@ -3594,6 +3750,7 @@ Private Sub b_resumen_Click
|
||||
Dim Pnl1 As B4XView = clv_resumenDia.GetPanel(n)
|
||||
Pnl1.LoadLayout("resumenItem")
|
||||
acomodaResItems
|
||||
p_resItem.Tag = CreateMap("mesa":o.GetString("PT_MESA"), "ticket":o.GetString("PT_TICKET"), "formaPago":o.GetString("PT_PAGO2"), "propinaPago":o.GetString("PT_PAGO_PROPINA"), "almacen":o.GetString("PT_ALMACEN"), "pago":o.GetString("PT_MONTO"), "propina":o.GetString("PT_PROPINA"))
|
||||
p_resItem.Width = clv_resumenDia.AsView.Width
|
||||
p_resItem.Height = Pnl1.Height
|
||||
l_mesa.Text = o.GetString("PT_MESA")
|
||||
@@ -3603,36 +3760,70 @@ Private Sub b_resumen_Click
|
||||
l_comprobante.Text = "NOTA"
|
||||
If o.GetString("PT_FACTURAR") = "true" Then l_comprobante.Text = "FACTURA"
|
||||
l_formaPago.Text = o.GetString("PT_PAGO2")
|
||||
Select o.GetString("PT_PAGO_PROPINA")
|
||||
Case "Mifel"
|
||||
l_propinaPago.Text = "Mifel"
|
||||
Case "Visa/Mastercard Debito"
|
||||
l_propinaPago.Text = "Mifel Debito"
|
||||
Case "Amex"
|
||||
l_propinaPago.Text = "Amex"
|
||||
Case "Efectivo"
|
||||
l_propinaPago.Text = "Efectivo"
|
||||
End Select
|
||||
Log($"|${o.GetString("PT_PAGO_PROPINA")}|${l_propinaPago.Text}|"$)
|
||||
' l_propinaPago.Text = o.GetString("PT_PAGO_PROPINA")
|
||||
' If o.GetString("PT_PAGO2") = "null" Then l_formaPago.Text = "PENDIENTE"
|
||||
n = n + 1
|
||||
Loop
|
||||
|
||||
Private propAmex = "0", propMifel = "0", propMifelDebito = "0", propEfectivo = "0" As String
|
||||
Private rt As ResultSet = Starter.skmt.ExecQuery($"Select sum(pt_monto) as ptMonto, sum(pt_propina) as ptPropina, * from pedido_ticket where pt_pago <> 'VENTA' and PT_PAGO <> 'MULTI-TICKET' group by pt_pago2"$)
|
||||
Private rtpa As ResultSet = Starter.skmt.ExecQuery($"Select ifnull(sum(pt_propina),0) as ptPropina, * from pedido_ticket where pt_pago_propina = 'Amex' group by pt_pago_propina"$)
|
||||
Do While rtpa.NextRow
|
||||
propAmex = rtpa.GetString("ptPropina")
|
||||
Loop
|
||||
Private rtpmc As ResultSet = Starter.skmt.ExecQuery($"Select ifnull(sum(pt_propina),0) as ptPropina, * from pedido_ticket where pt_pago_propina = 'Mifel' group by pt_pago_propina"$)
|
||||
Do While rtpmc.NextRow
|
||||
propMifel = rtpmc.GetString("ptPropina")
|
||||
Loop
|
||||
Log(propMifel)
|
||||
' Private rtpmd As ResultSet = Starter.skmt.ExecQuery($"Select ifnull(sum(pt_propina),0) as ptPropina, * from pedido_ticket where pt_pago_propina = 'Visa/Mastercard Debito XXX' group by pt_pago_propina"$)
|
||||
' Do While rtpmd.NextRow
|
||||
' propMifelDebito = rtpmd.GetString("ptPropina")
|
||||
' Loop
|
||||
Private rtpe As ResultSet = Starter.skmt.ExecQuery($"Select ifnull(sum(pt_propina),0) as ptPropina, * from pedido_ticket where pt_pago_propina = 'Efectivo' group by pt_pago_propina"$)
|
||||
Do While rtpe.NextRow
|
||||
propEfectivo = rtpe.GetString("ptPropina")
|
||||
Loop
|
||||
Log(rtpa.RowCount)
|
||||
Private consumoTotales As String = 0
|
||||
Private propinaTotales As String = 0
|
||||
Private totalTotales As String = 0
|
||||
Do While rt.NextRow
|
||||
consumoTotales = consumoTotales + rt.GetString("ptMonto")
|
||||
propinaTotales = propinaTotales + rt.GetString("ptPropina")
|
||||
' propinaTotales = propinaTotales + rt.GetString("ptPropina")
|
||||
totalTotales = totalTotales + rt.GetString("ptMonto") + rt.GetString("ptPropina")
|
||||
If rt.GetString("PT_PAGO") = "EFECTIVO" Then
|
||||
l_consumoEfectivo.Text = $"$${NumberFormat2(rt.GetString("ptMonto"), 1, 2, 2, True)}"$
|
||||
l_propinaEfectivo.Text = $"$${NumberFormat2(rt.GetString("ptPropina"), 1, 2, 2, True)}"$
|
||||
l_totalEfectivo.Text = $"$${NumberFormat2((rt.GetString("ptMonto") + rt.GetString("ptPropina")), 1, 2, 2, True)}"$
|
||||
else if rt.GetString("PT_PAGO2") = "American Express" Then
|
||||
' l_propinaEfectivo.Text = $"$${NumberFormat2(rt.GetString("ptPropina"), 1, 2, 2, True)}"$
|
||||
l_totalEfectivo.Text = $"$${NumberFormat2((rt.GetString("ptMonto") + propEfectivo), 1, 2, 2, True)}"$
|
||||
else if rt.GetString("PT_PAGO2") = "Amex" Then
|
||||
l_consumoAmex.Text = $"$${NumberFormat2(rt.GetString("ptMonto"), 1, 2, 2, True)}"$
|
||||
l_propinaAmex.Text = $"$${NumberFormat2(rt.GetString("ptPropina"), 1, 2, 2, True)}"$
|
||||
l_totalAmex.Text = $"$${NumberFormat2((rt.GetString("ptMonto") + rt.GetString("ptPropina")), 1, 2, 2, True)}"$
|
||||
else if rt.GetString("PT_PAGO2") = "Visa/Mastercard Credito" Then
|
||||
' l_propinaAmex.Text = $"$${NumberFormat2(rt.GetString("ptPropina"), 1, 2, 2, True)}"$
|
||||
l_totalAmex.Text = $"$${NumberFormat2((rt.GetString("ptMonto") + propAmex), 1, 2, 2, True)}"$
|
||||
else if rt.GetString("PT_PAGO2") = "Mifel" Then
|
||||
l_consumoTDC.Text = $"$${NumberFormat2(rt.GetString("ptMonto"), 1, 2, 2, True)}"$
|
||||
l_propinaTDC.Text = $"$${NumberFormat2(rt.GetString("ptPropina"), 1, 2, 2, True)}"$
|
||||
l_totalTDC.Text = $"$${NumberFormat2((rt.GetString("ptMonto") + rt.GetString("ptPropina")), 1, 2, 2, True)}"$
|
||||
' l_propinaTDC.Text = $"$${NumberFormat2(rt.GetString("ptPropina"), 1, 2, 2, True)}"$
|
||||
l_totalTDC.Text = $"$${NumberFormat2((rt.GetString("ptMonto") + propMifel), 1, 2, 2, True)}"$
|
||||
else if rt.GetString("PT_PAGO2") = "Visa/Mastercard Debito" Then
|
||||
l_consumoTDD.Text = $"$${NumberFormat2(rt.GetString("ptMonto"), 1, 2, 2, True)}"$
|
||||
l_propinaTDD.Text = $"$${NumberFormat2(rt.GetString("ptPropina"), 1, 2, 2, True)}"$
|
||||
l_totalTDD.Text = $"$${NumberFormat2((rt.GetString("ptMonto") + rt.GetString("ptPropina")), 1, 2, 2, True)}"$
|
||||
' l_propinaTDD.Text = $"$${NumberFormat2(rt.GetString("ptPropina"), 1, 2, 2, True)}"$
|
||||
l_totalTDD.Text = $"$${NumberFormat2((rt.GetString("ptMonto") + propMifelDebito), 1, 2, 2, True)}"$
|
||||
End If
|
||||
Loop
|
||||
l_propinaAmex.Text = $"$${NumberFormat2(propAmex, 1, 2, 2, True)}"$
|
||||
l_propinaTDC.Text = $"$${NumberFormat2(propMifel, 1, 2, 2, True)}"$
|
||||
l_propinaEfectivo.Text = $"$${NumberFormat2(propEfectivo, 1, 2, 2, True)}"$
|
||||
propinaTotales = propAmex + propMifel + propMifelDebito + propEfectivo
|
||||
l_consumoTotal.Text = "$" & NumberFormat2(consumoTotales, 1, 2, 2, True)
|
||||
l_propinaTotal.Text = "$" & NumberFormat2(propinaTotales, 1, 2, 2, True)
|
||||
l_totalTotal.Text = "$" & NumberFormat2(totalTotales, 1, 2, 2, True)
|
||||
@@ -3646,14 +3837,16 @@ Sub acomodaResItems
|
||||
l_titResConsumo.Left = l_consumo.left + 10dip : l_titResConsumo.width = l_consumo.Width
|
||||
l_propina.Width = clv_resumenDia.AsView.Width * 0.15
|
||||
l_propina.Left = l_consumo.Left + l_consumo.Width + 1
|
||||
l_propinaPago.Left = l_propina.Left + l_propina.Width + 1
|
||||
l_titResPropina.Left = l_propina.left + 10dip : l_titResPropina.width = l_propina.Width
|
||||
l_titResPropinaPago.Left = l_propinaPago.left + 10dip : l_titResPropinaPago.width = l_propinaPago.Width
|
||||
l_total.Width = clv_resumenDia.AsView.Width * 0.15
|
||||
l_total.Left = l_propina.Left + l_propina.Width + 1
|
||||
l_total.Left = l_propinaPago.Left + l_propinaPago.Width + 1
|
||||
l_titResPagoTot.Left = l_total.left + 10dip : l_titResPagoTot.width = l_total.Width
|
||||
l_comprobante.Width = clv_resumenDia.AsView.Width * 0.15
|
||||
l_comprobante.Left = l_total.Left + l_total.Width + 1
|
||||
l_titResComprobante.Left = l_comprobante.left + 10dip : l_titResComprobante.width = l_comprobante.Width
|
||||
l_formaPago.Width = clv_resumenDia.AsView.Width * 0.20
|
||||
l_formaPago.Width = clv_resumenDia.AsView.Width * 0.17
|
||||
l_formaPago.Left = l_comprobante.Left + l_comprobante.Width + 1
|
||||
l_titResFormaPago.Left = l_formaPago.left + 10dip : l_titResFormaPago.width = l_formaPago.Width
|
||||
End Sub
|
||||
@@ -3668,7 +3861,7 @@ Private Sub cb_factura_CheckedChange(Checked As Boolean)
|
||||
cb_mostrarDescuento.Enabled = False
|
||||
Else
|
||||
Log(333)
|
||||
' cb_leyendaDescuento.Enabled = True
|
||||
cb_leyendaDescuento.Enabled = True
|
||||
cb_mostrarDescuento.Enabled = True
|
||||
End If
|
||||
Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_FACTURAR = '${Checked}' where PT_TICKET = '${Starter.ticketActual}' and PT_MESA = '${Starter.mesaActual}' and PT_PAGO = 'VENTA'"$)
|
||||
@@ -3679,7 +3872,43 @@ Private Sub p_resumenDia_Click
|
||||
End Sub
|
||||
|
||||
Private Sub p_resItem_Click
|
||||
Log(Sender.As(Panel).tag)
|
||||
p_contScrollView.BringToFront
|
||||
End Sub
|
||||
|
||||
Private Sub p_resItem_LongClick
|
||||
Log(Sender.As(Panel).tag)
|
||||
cambioPago = Sender.As(Panel).tag.As(Map).Get("formaPago")
|
||||
cambioPagoPropina = Sender.As(Panel).tag.As(Map).Get("propinaPago")
|
||||
If cambioPagoPropina = "" Then cambioPagoPropina = "Efectivo"
|
||||
cb_nuevoPago.SelectedIndex = cb_nuevoPago.IndexOf(cambioPago)
|
||||
cb_nuevoPagoPropina.SelectedIndex = cb_nuevoPagoPropina.IndexOf(cambioPagoPropina)
|
||||
et_nuevoPago.Text = Sender.As(Panel).tag.As(Map).Get("pago")
|
||||
et_nuevoPagoPropina.Text = Sender.As(Panel).tag.As(Map).Get("propina")
|
||||
Log($"${cb_nuevoPago.IndexOf(cambioPago)}, ${cb_nuevoPagoPropina.IndexOf(cambioPagoPropina)}"$)
|
||||
b_cambioPagos.Tag = Sender.As(Panel).tag
|
||||
p_transparenteCambioPagos.Top = 0 : p_transparenteCambioPagos.left = 0
|
||||
p_transparenteCambioPagos.Width = Activity.Width : p_transparenteCambioPagos.Height = Activity.height
|
||||
Subs.centraBoton(b_cambioPagos, p_cambioPagos.Width)
|
||||
Subs.centraPanel(p_cambioPagos, Activity.Width)
|
||||
p_transparenteCambioPagos.Visible = True
|
||||
End Sub
|
||||
|
||||
Private Sub b_cambioPagos_Click
|
||||
p_transparenteCambioPagos.Visible = False
|
||||
Log(Sender.As(Button).tag)
|
||||
Private m As Map = Sender.As(Button).tag
|
||||
Private alm As String = m.Get("almacen")
|
||||
If alm = "null" Then alm = ""
|
||||
Log("|" & alm & "|")
|
||||
If alm = "MULTI-TICKET" Then
|
||||
Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_MONTO = '${et_nuevoPago.text}', PT_PROPINA = '${et_nuevoPagoPropina.text}', PT_PAGO_PROPINA = '${cambioPagoPropina}', PT_PAGO2 = '${cambioPago}' where PT_MESA = '${m.Get("mesa")}' and PT_TICKET = '${m.Get("ticket")}'"$)
|
||||
Log($"update PEDIDO_TICKET set PT_PAGO_PROPINA = '${cambioPagoPropina}', PT_PAGO2 = '${cambioPago}' where PT_MESA = '${m.Get("mesa")}' and PT_TICKET = '${m.Get("ticket")}''"$)
|
||||
Else
|
||||
Starter.skmt.ExecNonQuery($"update PEDIDO_TICKET set PT_PAGO_PROPINA = '${cambioPagoPropina}', PT_PAGO2 = '${cambioPago}', PT_TARJETA = '${cambioPago}' where PT_MESA = '${m.Get("mesa")}' and PT_TICKET = '${m.Get("ticket")}'"$)
|
||||
Log($"update PEDIDO_TICKET set PT_PAGO_PROPINA = '${cambioPagoPropina}', PT_PAGO2 = '${cambioPago}', PT_TARJETA = '${cambioPago}' where PT_MESA = '${m.Get("mesa")}' and PT_TICKET = '${m.Get("ticket")}'"$)
|
||||
End If
|
||||
b_resumen_Click
|
||||
End Sub
|
||||
|
||||
Private Sub b_reimprimirTicket_Click
|
||||
@@ -3691,3 +3920,25 @@ Private Sub b_reimprimirTicket_Click
|
||||
imprimirEfectivo = True
|
||||
b_leyendaDescuento_Click
|
||||
End Sub
|
||||
|
||||
Private Sub cb_nuevoPagoPropina_SelectedIndexChanged (Index As Int)
|
||||
cambioPagoPropina = cb_nuevoPagoPropina.SelectedItem
|
||||
End Sub
|
||||
|
||||
Private Sub cb_nuevoPago_SelectedIndexChanged (Index As Int)
|
||||
cambioPago = cb_nuevoPago.SelectedItem
|
||||
End Sub
|
||||
|
||||
Private Sub p_transparenteCambioPagos_Click
|
||||
p_transparenteCambioPagos.Visible = False
|
||||
End Sub
|
||||
|
||||
Sub p_contScrollView_Click
|
||||
p_contScrollView.BringToFront
|
||||
Log("p_contScrollView TO FRONT")
|
||||
End Sub
|
||||
|
||||
Sub p_resumenDiaTotales_Click
|
||||
p_resumenDiaTotales.BringToFront
|
||||
Log("p_resumenDiaTotales TO FRONT")
|
||||
End Sub
|
||||
|
||||
@@ -32,6 +32,7 @@ Sub Process_Globals
|
||||
Dim atrasPresionado As Boolean = False
|
||||
Dim cargaMeseros As Boolean = False
|
||||
Dim ticketFactura As Boolean
|
||||
Dim muestraProgreso = 0
|
||||
End Sub
|
||||
|
||||
Sub Service_Create
|
||||
|
||||
Reference in New Issue
Block a user