Compare commits

..

1 Commits

Author SHA1 Message Date
Jeroen Peelaerts
84f2c5bc97 Fix employee update (#3239) 2021-08-04 00:07:33 +02:00
25 changed files with 331 additions and 830 deletions

View File

@@ -60,7 +60,6 @@ class Employees extends Persons
$person_info->$property = $this->xss_clean($value);
}
$data['person_info'] = $person_info;
$data['employee_id'] = $employee_id;
$modules = array();
foreach($this->Module->get_all_modules()->result() as $module)
@@ -192,9 +191,9 @@ class Employees extends Persons
}
}
public function check_username($employee_id)
public function check_username()
{
$exists = $this->Employee->username_exists($employee_id, $this->input->get('username'));
$exists = $this->Employee->username_exists($this->input->get('username'));
echo !$exists ? 'true' : 'false';
}
}

View File

@@ -849,10 +849,11 @@ class Items extends Secure_Controller
{
set_time_limit(240);
$failCodes = [];
$csv_rows = get_csv_file($_FILES['file_path']['tmp_name']);
$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
$allowed_stock_locations = $this->Stock_location->get_allowed_locations();
$failCodes = [];
$third_party_data = [];
$csv_rows = get_csv_file($_FILES['file_path']['tmp_name']);
$employee_id = $this->Employee->get_logged_in_employee_info()->person_id;
$allowed_stock_locations = $this->Stock_location->get_allowed_locations();
$attribute_definition_names = $this->Attribute->get_definition_names();
unset($attribute_definition_names[-1]); //Removes the common_none_selected_text from the array
@@ -871,20 +872,20 @@ class Items extends Secure_Controller
foreach($csv_rows as $key => $row)
{
$is_failed_row = FALSE;
$item_id = $row['Id'];
$is_update = !empty($item_id);
$item_data = array(
'item_id' => $item_id,
'name' => $row['Item Name'],
'description' => $row['Description'],
'category' => $row['Category'],
'cost_price' => $row['Cost Price'],
'unit_price' => $row['Unit Price'],
'reorder_level' => $row['Reorder Level'],
'deleted' => FALSE,
'hsn_code' => $row['HSN'],
'pic_filename' => $row['Image']);
$is_failed_row = FALSE;
$item_id = $row['Id'];
$is_update = !empty($item_id);
$item_data = array(
'item_id' => $item_id,
'name' => $row['Item Name'],
'description' => $row['Description'],
'category' => $row['Category'],
'cost_price' => $row['Cost Price'],
'unit_price' => $row['Unit Price'],
'reorder_level' => $row['Reorder Level'],
'deleted' => FALSE,
'hsn_code' => $row['HSN'],
'pic_filename' => $row['Image']);
if(!empty($row['supplier_id']))
{
@@ -893,13 +894,13 @@ class Items extends Secure_Controller
if($is_update)
{
$item_data['allow_alt_description'] = empty($row['Allow Alt Description']) ? NULL : $row['Allow Alt Description'];
$item_data['is_serialized'] = empty($row['Item has Serial Number']) ? NULL : $row['Item has Serial Number'];
$item_data['allow_alt_description'] = empty($row['Allow Alt Description']) ? NULL : $row['Allow Alt Description'];
$item_data['is_serialized'] = empty($row['Item has Serial Number']) ? NULL : $row['Item has Serial Number'];
}
else
{
$item_data['allow_alt_description'] = empty($row['Allow Alt Description'])? '0' : '1';
$item_data['is_serialized'] = empty($row['Item has Serial Number'])? '0' : '1';
$item_data['allow_alt_description'] = empty($row['Allow Alt Description'])? '0' : '1';
$item_data['is_serialized'] = empty($row['Item has Serial Number'])? '0' : '1';
}
if(!empty($row['Barcode']))
@@ -913,8 +914,7 @@ class Items extends Secure_Controller
$is_failed_row = $this->data_error_check($row, $item_data, $allowed_stock_locations, $attribute_definition_names, $attribute_data);
}
//Remove FALSE, NULL, '' and empty strings but keep 0
$item_data = array_filter($item_data, 'strlen');
$item_data = $this->item_lib->custom_array_filter($item_data);
if(!$is_failed_row && $this->Item->save($item_data, $item_id))
{
@@ -929,8 +929,8 @@ class Items extends Secure_Controller
}
else
{
$failed_row = $key+2;
$failCodes[] = $failed_row;
$failed_row = $key+2;
$failCodes[] = $failed_row;
log_message('ERROR',"CSV Item import failed on line $failed_row. This item was not imported.");
}
@@ -969,14 +969,14 @@ class Items extends Secure_Controller
*/
private function data_error_check($row, $item_data, $allowed_locations, $definition_names, $attribute_data)
{
$item_id = $row['Id'];
$is_update = $item_id ? TRUE : FALSE;
$item_id = $row['Id'];
$is_update = $item_id ? TRUE : FALSE;
//Check for empty required fields
$check_for_empty = array(
'name' => $item_data['name'],
'category' => $item_data['category'],
'unit_price' => $item_data['unit_price']);
'name' => $item_data['name'],
'category' => $item_data['category'],
'unit_price' => $item_data['unit_price']);
foreach($check_for_empty as $key => $val)
{
@@ -1002,12 +1002,12 @@ class Items extends Secure_Controller
//Build array of fields to check for numerics
$check_for_numeric_values = array(
'cost_price' => $item_data['cost_price'],
'unit_price' => $item_data['unit_price'],
'reorder_level' => $item_data['reorder_level'],
'supplier_id' => $item_data['supplier_id'],
'Tax 1 Percent' => $row['Tax 1 Percent'],
'Tax 2 Percent' => $row['Tax 2 Percent']);
'cost_price' => $item_data['cost_price'],
'unit_price' => $item_data['unit_price'],
'reorder_level' => $item_data['reorder_level'],
'supplier_id' => $item_data['supplier_id'],
'Tax 1 Percent' => $row['Tax 1 Percent'],
'Tax 2 Percent' => $row['Tax 2 Percent']);
foreach($allowed_locations as $location_name)
{
@@ -1029,14 +1029,14 @@ class Items extends Secure_Controller
{
if(!empty($row["attribute_$definition_name"]))
{
$definition_type = $attribute_data[$definition_name]['definition_type'];
$attribute_value = $row["attribute_$definition_name"];
$definition_type = $attribute_data[$definition_name]['definition_type'];
$attribute_value = $row["attribute_$definition_name"];
switch($definition_type)
{
case DROPDOWN:
$dropdown_values = $attribute_data[$definition_name]['dropdown_values'];
$dropdown_values[] = '';
$dropdown_values = $attribute_data[$definition_name]['dropdown_values'];
$dropdown_values[] = '';
if(!empty($attribute_value) && in_array($attribute_value, $dropdown_values) === FALSE)
{
@@ -1135,20 +1135,20 @@ class Items extends Secure_Controller
private function save_inventory_quantities($row, $item_data, $allowed_locations, $employee_id)
{
//Quantities & Inventory Section
$comment = $this->lang->line('items_inventory_CSV_import_quantity');
$is_update = $row['Id'] ? TRUE : FALSE;
$comment = $this->lang->line('items_inventory_CSV_import_quantity');
$is_update = $row['Id'] ? TRUE : FALSE;
foreach($allowed_locations as $location_id => $location_name)
{
$item_quantity_data = array(
'item_id' => $item_data['item_id'],
'location_id' => $location_id);
'item_id' => $item_data['item_id'],
'location_id' => $location_id);
$csv_data = array(
'trans_items' => $item_data['item_id'],
'trans_user' => $employee_id,
'trans_comment' => $comment,
'trans_location' => $location_id);
'trans_items' => $item_data['item_id'],
'trans_user' => $employee_id,
'trans_comment' => $comment,
'trans_location' => $location_id);
if(!empty($row["location_$location_name"]) || $row["location_$location_name"] === '0')
{

View File

@@ -4,7 +4,7 @@ $lang["attributes_attribute_value_invalid_chars"] = "El valor del atributo no pu
$lang["attributes_confirm_delete"] = "¿Está seguro de que desea borrar los atributos seleccionados?";
$lang["attributes_confirm_restore"] = "¿Está seguro de que desea restaurar los atributos seleccionados?";
$lang["attributes_definition_cannot_be_deleted"] = "No se han podido borrar los atributos seleccionados";
$lang["attributes_definition_error_adding_updating"] = "El atributo %1 no pudo ser agregado o actulizado. Por favor, compruebe el registro de errores.";
$lang["attributes_definition_error_adding_updating"] = "El atributo %1 no pudo ser agregado o actualizado. Por favor compruebe el registro de errores.";
$lang["attributes_definition_flags"] = "Visibilidad del atributo";
$lang["attributes_definition_group"] = "Grupo";
$lang["attributes_definition_id"] = "Id";

View File

@@ -4,7 +4,7 @@ $lang["tables_all"] = "Todos";
$lang["tables_columns"] = "Columnas";
$lang["tables_hide_show_pagination"] = "Ocultar/Mostrar paginación";
$lang["tables_loading"] = "Por favor espere...";
$lang["tables_page_from_to"] = "Mostrando desde {0} hasta {1} - En total {2} resultados";
$lang["tables_refresh"] = "Refrescar";
$lang["tables_page_from_to"] = "Mostrando desde {0} hasta {1} de {2} resultados";
$lang["tables_refresh"] = "Actualizar";
$lang["tables_rows_per_page"] = "{0} resultados por página";
$lang["tables_toggle"] = "Ocultar/Mostrar";

View File

@@ -9,8 +9,8 @@ $lang["cashups_close_employee"] = "Cerrado por";
$lang["cashups_closed_amount_card"] = "Tarjetas";
$lang["cashups_closed_amount_cash"] = "Efectivo Final";
$lang["cashups_closed_amount_check"] = "Cheques";
$lang["cashups_closed_amount_due"] = "Cobros pendientes";
$lang["cashups_closed_amount_total"] = "Balance Total";
$lang["cashups_closed_amount_due"] = "Deudado";
$lang["cashups_closed_amount_total"] = "Total";
$lang["cashups_closed_date"] = "Fecha de Cierre";
$lang["cashups_confirm_delete"] = "¿Estás seguro de que quieres borrar el Turno seleccionado?";
$lang["cashups_confirm_restore"] = "¿Está seguro de que desea restaurar los Turnos seleccionados?";
@@ -24,7 +24,7 @@ $lang["cashups_is_deleted"] = "Borrado";
$lang["cashups_new"] = "Nuevo Turno";
$lang["cashups_no_cashups_to_display"] = "No hay Turnos para mostrar";
$lang["cashups_none_selected"] = "No ha seleccionado ningún Turno";
$lang["cashups_note"] = "Nota de pago";
$lang["cashups_note"] = "Notas";
$lang["cashups_one_or_multiple"] = "Turno(s)";
$lang["cashups_open_amount_cash"] = "Efectivo Inicial";
$lang["cashups_open_date"] = "Fecha de Apertura";
@@ -34,5 +34,5 @@ $lang["cashups_successful_adding"] = "Turno agregado con éxito";
$lang["cashups_successful_deleted"] = "Turno borrado con éxito";
$lang["cashups_successful_updating"] = "Turno actualizado con éxito";
$lang["cashups_total"] = "Total";
$lang["cashups_transfer_amount_cash"] = "Salida/Entrada de Efectivo";
$lang["cashups_transfer_amount_cash"] = "Entrada/Salida de Efectivo";
$lang["cashups_update"] = "Actualizar Turno";

View File

@@ -8,16 +8,16 @@ $lang["common_comments"] = "Comentarios";
$lang["common_common"] = "Común";
$lang["common_confirm_search"] = "Has seleccionado una o más filas. Éstas no estarán seleccionadas después de tu búsqueda. ¿Seguro(a) que quieres hacer esta búsqueda?";
$lang["common_copyrights"] = "© 2010 - %1";
$lang["common_correct_errors"] = "Por favor, corrija los errores identificados antes de guardar";
$lang["common_correct_errors"] = "Por favor corrija los errores identificados antes de guardar";
$lang["common_country"] = "País";
$lang["common_date"] = "Fecha";
$lang["common_delete"] = "Borrar";
$lang["common_det"] = "detalles";
$lang["common_det"] = "Detalles";
$lang["common_download_import_template"] = "Descargar Plantilla de Importación de CSV (CSV)";
$lang["common_edit"] = "editar";
$lang["common_edit"] = "Editar";
$lang["common_email"] = "Email";
$lang["common_email_invalid_format"] = "El correo-e no está en el formato requerido.";
$lang["common_export_csv"] = "Reporte en CSV";
$lang["common_export_csv"] = "Exportar CSV";
$lang["common_export_csv_no"] = "No";
$lang["common_export_csv_yes"] = "Si";
$lang["common_fields_required_message"] = "Los campos en rojo son requeridos";
@@ -73,7 +73,7 @@ $lang["common_unknown"] = "Desconocido";
$lang["common_view_recent_sales"] = "Ver Ventas Recientes";
$lang["common_website"] = "opensourcepos.org";
$lang["common_welcome"] = "Bienvenido(a)";
$lang["common_welcome_message"] = "Bienvenido(a) a OSPOS. ¡Haz click en algún módulo, para empezar.";
$lang["common_welcome_message"] = "Bienvenido(a) a OSPOS. Haz click en algún módulo para empezar.";
$lang["common_yes"] = "";
$lang["common_you_are_using_ospos"] = "Estás usando Open Source Point Of Sale Versión";
$lang["common_zip"] = "Código Postal";

View File

@@ -27,14 +27,14 @@ $lang["config_barcode_page_width"] = "Mostrar ancho de página";
$lang["config_barcode_price"] = "Precio";
$lang["config_barcode_second_row"] = "Fila 2";
$lang["config_barcode_third_row"] = "Fila 3";
$lang["config_barcode_tooltip"] = "Cuidado: esta característica puede causar duplicados ser importados o creados, No lo use si no quiere códigos de barras duplicadas.";
$lang["config_barcode_tooltip"] = "Cuidado: esta característica puede causar duplicados ser importados o creados. No lo use si no quiere códigos de barras duplicadas.";
$lang["config_barcode_type"] = "Tipo de Código de Barra";
$lang["config_barcode_width"] = "Ancho (px)";
$lang["config_bottom"] = "Abajo";
$lang["config_cash_decimals"] = "Decimales del Efectivo";
$lang["config_cash_decimals"] = "Decimales del efectivo";
$lang["config_cash_decimals_tooltip"] = "Si los decimales del efectivo y del tipo de moneda son los mismos no habrá redondeo de los pagos en efectivo.";
$lang["config_cash_rounding"] = "Redondeo del Efectivo";
$lang["config_category_dropdown"] = "Mostrar Categoria como desplegable";
$lang["config_cash_rounding"] = "Redondeo de efectivo";
$lang["config_category_dropdown"] = "";
$lang["config_center"] = "Centro";
$lang["config_comma"] = "coma";
$lang["config_company"] = "Nombre del Comercio";
@@ -44,16 +44,16 @@ $lang["config_company_remove_image"] = "Quitar Imagen";
$lang["config_company_required"] = "Nombre del Comercio es requerido";
$lang["config_company_select_image"] = "Seleccionar Imagen";
$lang["config_company_website_url"] = "Sitio Web no es una URL estándar (http://...).";
$lang["config_country_codes"] = "Código de País";
$lang["config_country_codes"] = "Codigo de pais";
$lang["config_country_codes_tooltip"] = "Lista de codigo de paises separado por coma para busqueda de direcciones.";
$lang["config_currency_code"] = "Código de Moneda";
$lang["config_currency_decimals"] = "Decimales del tipo de moneda";
$lang["config_currency_symbol"] = "Símbolo de la moneda";
$lang["config_customer_reward"] = "Cat. de Cliente";
$lang["config_currency_decimals"] = "Decimales de moneda";
$lang["config_currency_symbol"] = "Símbolo de moneda";
$lang["config_customer_reward"] = "Premio";
$lang["config_customer_reward_duplicate"] = "La recompensa debe ser única.";
$lang["config_customer_reward_enable"] = "Activar recompenza para clientes";
$lang["config_customer_reward_invalid_chars"] = "El nombre de la recompenza no puede contener el carácter '_'";
$lang["config_customer_reward_required"] = "El nombre es un campo obligatorio";
$lang["config_customer_reward_enable"] = "Activar los premios para los consumidores";
$lang["config_customer_reward_invalid_chars"] = "El nombre del premio no puede contener el carácter '_'";
$lang["config_customer_reward_required"] = "El premio es un campo obligatorio";
$lang["config_customer_sales_tax_support"] = "Habilitar la gestión de impuestos en las ventas a clientes";
$lang["config_date_or_time_format"] = "Filtro de fecha y hora";
$lang["config_datetimeformat"] = "Formato de fecha y hora";
@@ -96,7 +96,7 @@ $lang["config_dinner_table_enable"] = "Activar Mesa de Restaurante";
$lang["config_dinner_table_invalid_chars"] = "El nombre de la mesa no puede contener '_'.";
$lang["config_dinner_table_required"] = "La mesa es un campo obligatorio.";
$lang["config_dot"] = "punto";
$lang["config_email"] = "E-mail";
$lang["config_email"] = "Correo-e";
$lang["config_email_configuration"] = "Configuracion de correo";
$lang["config_email_mailpath"] = "Ruta a Sendmail";
$lang["config_email_protocol"] = "Protocolo";
@@ -157,8 +157,8 @@ $lang["config_invoice_email_message"] = "Plantilla de Factura por Email";
$lang["config_invoice_enable"] = "Activar Facturación";
$lang["config_invoice_printer"] = "Impresora Facturadora";
$lang["config_invoice_type"] = "Tipo de Factura";
$lang["config_is_readable"] = "es legible, pero los permisos de lectura son incorrectos. Pongalos en 640 o 660 cargue nuevamente.";
$lang["config_is_writable"] = "es grabable, pero los permisos de escritura son incorrectos. Pongalos en 750 y cargue nuevamente.";
$lang["config_is_readable"] = "";
$lang["config_is_writable"] = "es grabable, pero los permisos son superiores a 750.";
$lang["config_jsprintsetup_required"] = "Advertencia!Esta funcionalidad desactivada solo funciona con el addon jsPrintSetup de FireFox instalado. Guardar de todas formas?";
$lang["config_language"] = "Idioma";
$lang["config_last_used_invoice_number"] = "Último numero de factura utilizado";
@@ -186,7 +186,7 @@ $lang["config_mailchimp_key_successfully"] = "Clave API correcta.";
$lang["config_mailchimp_key_unsuccessfully"] = "Clave API incorrecta.";
$lang["config_mailchimp_lists"] = "Lista(s) de Mailchimp";
$lang["config_mailchimp_tooltip"] = "Haga clic en el icono de una clave de API.";
$lang["config_message"] = "Mensajes SMS";
$lang["config_message"] = "Mensaje";
$lang["config_message_configuration"] = "Configuracion del mensaje";
$lang["config_msg_msg"] = "Texto del mensaje guardado";
$lang["config_msg_msg_placeholder"] = "Si desea usar un formato de SMS guarde su mensaje aquí, en caso contrario deje en blanco.";
@@ -205,18 +205,18 @@ $lang["config_number_locale"] = "Localización";
$lang["config_number_locale_invalid"] = "Localización ingresada invalida. Revisa el link en el tooltip para encontrar informacion.";
$lang["config_number_locale_required"] = "Numero localizacion es un campo requerido.";
$lang["config_number_locale_tooltip"] = "Encontrar una zonificacion adecuada en este enlace.";
$lang["config_os_timezone"] = "Zona Horaria Local:";
$lang["config_os_timezone"] = "";
$lang["config_ospos_info"] = "Información de la Instalación OSPOS";
$lang["config_payment_options_order"] = "Orden de opciones de pago";
$lang["config_perm_risk"] = "Permisos superiores a 750 dejan este software en riesgo.";
$lang["config_phone"] = "Teléfono comercial";
$lang["config_phone"] = "Teléfono del Comercio";
$lang["config_phone_required"] = "Teléfono del Comercio es requerido.";
$lang["config_print_bottom_margin"] = "Margen Inferior";
$lang["config_print_bottom_margin_number"] = "Margen Inferior debe ser un número.";
$lang["config_print_bottom_margin_required"] = "Margen Inferior es requerido.";
$lang["config_print_delay_autoreturn"] = "Regresar automaticamente a Vender";
$lang["config_print_delay_autoreturn_number"] = "Tiempo espera requerido para regresar a ventas.";
$lang["config_print_delay_autoreturn_required"] = "El tiempo espera debe ser numérico.";
$lang["config_print_delay_autoreturn"] = "Devolver automatico a Vender";
$lang["config_print_delay_autoreturn_number"] = "Tiempo espera para Devolver a la venta es requerido.";
$lang["config_print_delay_autoreturn_required"] = "Tiempo espera Devolver a la Venta debe ser numero.";
$lang["config_print_footer"] = "Imprimir el pie de página del navegador";
$lang["config_print_header"] = "Imprimir el encabezado del navegador";
$lang["config_print_left_margin"] = "Margen Izquierdo";
@@ -233,7 +233,7 @@ $lang["config_print_silently"] = "Mostrar configuracion pre- impresión";
$lang["config_print_top_margin"] = "Margen Superior";
$lang["config_print_top_margin_number"] = "Margen Superior debe ser un número.";
$lang["config_print_top_margin_required"] = "Margen Superior es requerido.";
$lang["config_quantity_decimals"] = "Decimales de Cantidades";
$lang["config_quantity_decimals"] = "Cantidad de decimales";
$lang["config_quote_default_comments"] = "Comentario inicial de cotizaciones";
$lang["config_receipt"] = "Recibo";
$lang["config_receipt_configuration"] = "Parámetros de Impresión";
@@ -254,10 +254,10 @@ $lang["config_receipt_template"] = "Formato de recibo";
$lang["config_receiving_calculate_average_price"] = "Cal. precio prom. (Recepción)";
$lang["config_recv_invoice_format"] = "Formato de Factura de Recepción";
$lang["config_register_mode_default"] = "Modo de registro por defecto";
$lang["config_report_an_issue"] = "Informe de algún problema";
$lang["config_return_policy_required"] = "Política de Devolución requerida.";
$lang["config_reward"] = "Recompenzas";
$lang["config_reward_configuration"] = "Configuración de Recompenzas";
$lang["config_report_an_issue"] = "";
$lang["config_return_policy_required"] = "Política de Devolución es requerida.";
$lang["config_reward"] = "Premio";
$lang["config_reward_configuration"] = "Configuración de premios";
$lang["config_right"] = "Derecha";
$lang["config_sales_invoice_format"] = "Formato de Facturas de Venta";
$lang["config_sales_quote_format"] = "Formato de presupuesto de las ventas";
@@ -276,12 +276,12 @@ $lang["config_suggestions_first_column"] = "Columna 1";
$lang["config_suggestions_layout"] = "Sugerencias de búsqueda";
$lang["config_suggestions_second_column"] = "Columna 2";
$lang["config_suggestions_third_column"] = "Columna 3";
$lang["config_system_conf"] = "Sistema OSPOS";
$lang["config_system_conf"] = "Setup & Conf";
$lang["config_system_info"] = "System Info";
$lang["config_table"] = "Mesa";
$lang["config_table_configuration"] = "Configuración de Mesa";
$lang["config_takings_printer"] = "Impresión de retenciones";
$lang["config_tax"] = "Impuestos";
$lang["config_tax"] = "Imp";
$lang["config_tax_category"] = "Categoría impuesto";
$lang["config_tax_category_duplicate"] = "Categoría de impuesto ingresada ya existe.";
$lang["config_tax_category_invalid_chars"] = "Categoría de impuesto ingresada es invalida.";
@@ -295,10 +295,10 @@ $lang["config_theme"] = "Tema";
$lang["config_theme_preview"] = "";
$lang["config_thousands_separator"] = "Separador de miles";
$lang["config_timezone"] = "Zona Horaria";
$lang["config_timezone_error"] = "La zona horaria de OSPOS es diferente de tu zona horaria local.";
$lang["config_timezone_error"] = "";
$lang["config_top"] = "Arriba";
$lang["config_use_destination_based_tax"] = "Usar Impuesto Basado en Destino";
$lang["config_user_timezone"] = "Zona Horaria OSPOS:";
$lang["config_user_timezone"] = "";
$lang["config_website"] = "Sitio Web";
$lang["config_work_order_enable"] = "Soporte Ordenes de Trabajo";
$lang["config_work_order_format"] = "Formato Ordenes de trabajo";

View File

@@ -4,26 +4,26 @@ $lang["item_kits_add_item"] = "Agregar Artículo";
$lang["item_kits_all"] = "Todo";
$lang["item_kits_cannot_be_deleted"] = "Borrado de Kit(s) de Artículos fallido.";
$lang["item_kits_confirm_delete"] = "¿Estás seguro(a) de querer borrar los kits seleccionados?";
$lang["item_kits_confirm_restore"] = "Esta seguro de quere restaurar los kit seleccionados?";
$lang["item_kits_description"] = "Descripción";
$lang["item_kits_confirm_restore"] = "Esta seguro de quere restaurar lo(s) kit(s) seleccionado(s)?";
$lang["item_kits_description"] = "Descripción del Kit de Artículos";
$lang["item_kits_discount"] = "Descuento";
$lang["item_kits_discount_fixed"] = "Descuento Fijo";
$lang["item_kits_discount_percent"] = "Porcentaje de descuento";
$lang["item_kits_discount_type"] = "Tipo de Descuento";
$lang["item_kits_error_adding_updating"] = "Error agregando/actualizando Kit de Artículos.";
$lang["item_kits_find_kit_item"] = "Buscar Kit";
$lang["item_kits_info"] = "Info de Kit";
$lang["item_kits_find_kit_item"] = "Kit de Artículo";
$lang["item_kits_info"] = "Info de Kit de Artículos";
$lang["item_kits_item"] = "Artículo";
$lang["item_kits_item_kit_number"] = "Código";
$lang["item_kits_item_number_duplicate"] = "Código de Kit Duplicado";
$lang["item_kits_item_kit_number"] = "";
$lang["item_kits_item_kit_number_duplicate"] = "";
$lang["item_kits_item_number"] = "";
$lang["item_kits_items"] = "Artículos";
$lang["item_kits_kit"] = "Id";
$lang["item_kits_kit"] = "Id Kit";
$lang["item_kits_kit_and_components"] = "Artículos y componentes";
$lang["item_kits_kit_and_stock"] = "Artículos y stocks";
$lang["item_kits_kit_only"] = "Solo artículos";
$lang["item_kits_name"] = "Nombre del Kit";
$lang["item_kits_new"] = "Nuevo Kit";
$lang["item_kits_name"] = "Nombre del Kit de Artículos";
$lang["item_kits_new"] = "Nuevo Kit de Artículos";
$lang["item_kits_no_item_kits_to_display"] = "Sin kits de artículos para mostrar.";
$lang["item_kits_none_selected"] = "No has seleccionado Kits de Artículos.";
$lang["item_kits_one_or_multiple"] = "Kit(s) de Artículos";
@@ -31,7 +31,7 @@ $lang["item_kits_price_option"] = "Opción del precio";
$lang["item_kits_priced_only"] = "Solo con precio";
$lang["item_kits_print_option"] = "Opciones de impresión";
$lang["item_kits_quantity"] = "Cantidad";
$lang["item_kits_sequence"] = "Orden";
$lang["item_kits_sequence"] = "Secuencia";
$lang["item_kits_successful_adding"] = "Has agregado satisfactoriamente un Kit de Artículos";
$lang["item_kits_successful_deleted"] = "Has borrado satisfactoriamente";
$lang["item_kits_successful_updating"] = "Has actualizado satisfactoriamente un Kit de Artículos";

View File

@@ -15,18 +15,18 @@ $lang["sales_cash_deposit"] = "Deposito Efectivo";
$lang["sales_cash_filter"] = "Efectivo";
$lang["sales_change_due"] = "Cambio";
$lang["sales_change_price"] = "Cambiar el precio de venta";
$lang["sales_check"] = "Cheque";
$lang["sales_check"] = "Comprobación de ventas";
$lang["sales_check_balance"] = "Balance de Cheque";
$lang["sales_check_filter"] = "Cheque";
$lang["sales_check_filter"] = "Comprobar";
$lang["sales_comment"] = "Comentario";
$lang["sales_comments"] = "Comentarios";
$lang["sales_complete_sale"] = "Completar Venta";
$lang["sales_confirm_cancel_sale"] = "¿Seguro quiere cancelar esta venta? Todos los artículos serán eliminados.";
$lang["sales_confirm_delete"] = "¿Seguro quiere borrar las ventas seleccionadas?";
$lang["sales_confirm_cancel_sale"] = "¿Seguro(a) de querer limpiar esta venta? Todos los artículos serán limpiados.";
$lang["sales_confirm_delete"] = "¿Seguro(a) de querer borrar las ventas seleccionadas?";
$lang["sales_confirm_restore"] = "Esta seguro de querer restaurar la(s) venta(s) seleccionada(s)?";
$lang["sales_credit"] = "Tarjeta de Crédito";
$lang["sales_credit_deposit"] = "Deposito Credito";
$lang["sales_credit_filter"] = "Tarjeta de Crédito";
$lang["sales_credit_filter"] = "";
$lang["sales_customer"] = "cliente";
$lang["sales_customer_address"] = "Direccion";
$lang["sales_customer_discount"] = "Descuento";
@@ -41,9 +41,8 @@ $lang["sales_date_range"] = "Rango de Fecha";
$lang["sales_date_required"] = "Una fecha correcta debe ser ingresada.";
$lang["sales_date_type"] = "Campo de Fecha es requerido.";
$lang["sales_debit"] = "Tarjeta de Débito";
$lang["sales_debit_filter"] = "Tarjeta de Débito";
$lang["sales_delete"] = "Permitir borrar";
$lang["sales_delete_confirmation"] = "¿Seguro quiere borrar esta venta? Esta acción no se puede deshacer.";
$lang["sales_delete_confirmation"] = "¿Seguro(a) de querer borrar esta venta? Esta acción no se puede deshacer.";
$lang["sales_delete_entire_sale"] = "Borrar la venta completa";
$lang["sales_delete_successful"] = "Venta borrada correctamente.";
$lang["sales_delete_unsuccessful"] = "Venta no borrada, fallida.";
@@ -53,8 +52,8 @@ $lang["sales_discard_quote"] = "Descartar";
$lang["sales_discount"] = "Descuento";
$lang["sales_discount_included"] = "% Descuento";
$lang["sales_discount_short"] = "%";
$lang["sales_due"] = "Adeudado";
$lang["sales_due_filter"] = "Adeudado";
$lang["sales_due"] = "Deudado";
$lang["sales_due_filter"] = "Deudado";
$lang["sales_edit"] = "Editar";
$lang["sales_edit_item"] = "Editar Artículo";
$lang["sales_edit_sale"] = "Editar Venta";
@@ -163,7 +162,7 @@ $lang["sales_tax"] = "Imp";
$lang["sales_tax_id"] = "Identificador del Impuesto";
$lang["sales_tax_invoice"] = "Impuesto de la Factura";
$lang["sales_tax_percent"] = "% de Imp";
$lang["sales_taxed_ind"] = "Ventas gravadas";
$lang["sales_taxed_ind"] = "I";
$lang["sales_total"] = "Total";
$lang["sales_total_tax_exclusive"] = "Sin impuesto";
$lang["sales_transaction_failed"] = "La transacción de venta falló.";

View File

@@ -1,4 +1,5 @@
<?php
<?php
$lang["employees_basic_information"] = "Información";
$lang["employees_cannot_be_deleted"] = "No se puede borrar los empleados seleccionados, uno o más de ellos tienen ventas registradas ó intentas borrar tu propia cuenta.";
$lang["employees_change_password"] = "Cambiar contraseña";
@@ -34,4 +35,3 @@ $lang["employees_update"] = "Actualizar Empleado";
$lang["employees_username"] = "Nombre de Usuario";
$lang["employees_username_minlength"] = "Nombre de usuario debe tener por lo menos 5 letras.";
$lang["employees_username_required"] = "Es necesario el nombre de usuario.";
$lang["employees_username_duplicate"] = "El usuario del empleado ya esta en uso. Favor de escoger otro.";

View File

@@ -1,4 +1,5 @@
<?php
<?php
$lang["item_kits_add_item"] = "Agregar Artículo";
$lang["item_kits_all"] = "Todo";
$lang["item_kits_cannot_be_deleted"] = "Borrado de Kit(s) de Artículos fallido.";
@@ -6,7 +7,7 @@ $lang["item_kits_confirm_delete"] = "¿Estás seguro(a) de querer borrar los kit
$lang["item_kits_confirm_restore"] = "¿Está seguro de querer restaurar lo(s) kit(s) seleccionado(s)?";
$lang["item_kits_description"] = "Descripción del Kit de Artículos";
$lang["item_kits_discount"] = "Descuento";
$lang["item_kits_discount_fixed"] = "Descuento Fijo";
$lang["item_kits_discount_fixed"] = "";
$lang["item_kits_discount_percent"] = "Porcentaje de descuento";
$lang["item_kits_discount_type"] = "Tipo de Descuento";
$lang["item_kits_error_adding_updating"] = "Error agregando/actualizando Kit de Artículos.";

View File

@@ -1,18 +1,19 @@
<?php
$lang["items_add_minus"] = "Inventario a agregar o disminuir.";
$lang["items_allow_alt_description"] = "Permitir Descripción Alternativa";
$lang["items_amount_entry"] = "Ingrese Cantidad";
$lang["items_bulk_edit"] = "Edición Masiva";
$lang["items_buy_price_required"] = "Precio de Compra es un campo requerido.";
$lang["items_cannot_be_deleted"] = "No se puede borrar el item(s) seleccionado, uno a mas de los items seleccionados tienen ventas.";
$lang["items_cannot_find_item"] = "Articulo no encontrado.";
$lang["items_category"] = "Categoría";
$lang["items_category_required"] = "Categoría es un campo requerido.";
$lang["items_change_all_to_allow_alt_desc"] = "Permitir Descripción Alternativa para todo.";
$lang["items_change_all_to_not_allow_allow_desc"] = "No permitir Descripción Alternativa para todo.";
$lang["items_change_all_to_serialized"] = "Cambiar todo a Serializado";
$lang["items_change_all_to_unserialized"] = "Cambiar todo a No-Serializado";
$lang["items_change_image"] = "Cambiar Imagen";
<?php
$lang["items_add_minus"] = "";
$lang["items_allow_alt_description"] = "";
$lang["items_amount_entry"] = "";
$lang["items_bulk_edit"] = "";
$lang["items_buy_price_required"] = "";
$lang["items_cannot_be_deleted"] = "";
$lang["items_cannot_find_item"] = "";
$lang["items_category"] = "";
$lang["items_category_required"] = "";
$lang["items_change_all_to_allow_alt_desc"] = "";
$lang["items_change_all_to_not_allow_allow_desc"] = "";
$lang["items_change_all_to_serialized"] = "";
$lang["items_change_all_to_unserialized"] = "";
$lang["items_change_image"] = "";
$lang["items_confirm_bulk_edit"] = "";
$lang["items_confirm_bulk_edit_wipe_taxes"] = "";
$lang["items_confirm_delete"] = "";

View File

@@ -1,12 +1,13 @@
<?php
$lang["login_gcaptcha"] = "No soy un robot.";
$lang["login_go"] = "Entrar";
$lang["login_invalid_gcaptcha"] = "Por favor compruebe que usted no es un robot.";
$lang["login_invalid_installation"] = "La instalacion no es correcta, revise el archivo php.ini.";
$lang["login_invalid_username_and_password"] = "Usuario y/o Password Invalido.";
$lang["login_login"] = "Login";
$lang["login_logout"] = "Salir";
$lang["login_migration_needed"] = "Una migración de base de datos a %1 empezara después de entrar.";
$lang["login_password"] = "Contraseña";
$lang["login_username"] = "Usuario";
$lang["login_welcome"] = "Bienvenido a %1!";
<?php
$lang["login_gcaptcha"] = "";
$lang["login_go"] = "";
$lang["login_invalid_gcaptcha"] = "";
$lang["login_invalid_installation"] = "";
$lang["login_invalid_username_and_password"] = "";
$lang["login_login"] = "";
$lang["login_logout"] = "";
$lang["login_migration_needed"] = "";
$lang["login_password"] = "";
$lang["login_username"] = "";
$lang["login_welcome"] = "";

View File

@@ -1,13 +1,14 @@
<?php
$lang["messages_first_name"] = "Nombre(s)";
$lang["messages_last_name"] = "Apellido(s)";
$lang["messages_message"] = "Mensaje";
$lang["messages_message_placeholder"] = "Tu mensaje aquí...";
$lang["messages_message_required"] = "Requiere mensaje";
$lang["messages_multiple_phones"] = "(En caso de varios destinatarios, ingrese los números de teléfono separado por comas)";
$lang["messages_phone"] = "Número de teléfono";
$lang["messages_phone_number_required"] = "Requiere de número telefónico";
$lang["messages_phone_placeholder"] = "Números de teléfonos celulares aquí...";
$lang["messages_sms_send"] = "Enviar SMS";
$lang["messages_successfully_sent"] = "Mensaje enviado exitosamente a: ";
$lang["messages_unsuccessfully_sent"] = "Mensaje no enviado a: ";
<?php
$lang["messages_first_name"] = "";
$lang["messages_last_name"] = "";
$lang["messages_message"] = "";
$lang["messages_message_placeholder"] = "";
$lang["messages_message_required"] = "";
$lang["messages_multiple_phones"] = "";
$lang["messages_phone"] = "";
$lang["messages_phone_number_required"] = "";
$lang["messages_phone_placeholder"] = "";
$lang["messages_sms_send"] = "";
$lang["messages_successfully_sent"] = "";
$lang["messages_unsuccessfully_sent"] = "";

View File

@@ -1,18 +1,19 @@
<?php
$lang["module_attributes"] = "Atributos";
$lang["module_attributes_desc"] = "Agregar, Actualizar, Borrar y Buscar atributos.";
$lang["module_both"] = "Ambos";
$lang["module_cashups"] = "Corte de Caja";
$lang["module_cashups_desc"] = "Agregar, Actualizar, Borrar y Buscar Cortes de Caja.";
$lang["module_config"] = "Configuración";
$lang["module_config_desc"] = "Cambiar Configuracion de OSPOS.";
$lang["module_customers"] = "Clientes";
$lang["module_customers_desc"] = "Agregar, Actualizar, Borrar y Buscar Clientes.";
$lang["module_employees"] = "Empleados";
$lang["module_employees_desc"] = "Agregar, Actualizar, Borrar y Buscar Empleados.";
$lang["module_expenses"] = "Gastos";
$lang["module_expenses_categories"] = "Categorías de Gastos";
$lang["module_expenses_categories_desc"] = "Agregar, Actualizar, y Borrar Categorías de Gastos.";
<?php
$lang["module_attributes"] = "";
$lang["module_attributes_desc"] = "";
$lang["module_both"] = "";
$lang["module_cashups"] = "";
$lang["module_cashups_desc"] = "";
$lang["module_config"] = "";
$lang["module_config_desc"] = "";
$lang["module_customers"] = "";
$lang["module_customers_desc"] = "";
$lang["module_employees"] = "";
$lang["module_employees_desc"] = "";
$lang["module_expenses"] = "";
$lang["module_expenses_categories"] = "";
$lang["module_expenses_categories_desc"] = "";
$lang["module_expenses_desc"] = "";
$lang["module_giftcards"] = "";
$lang["module_giftcards_desc"] = "";

View File

@@ -1,53 +1,54 @@
<?php
$lang["receivings_cancel_receiving"] = "Cancelar";
$lang["receivings_cannot_be_deleted"] = "Falló al borrar Entrada(s).";
$lang["receivings_comments"] = "Comentarios";
$lang["receivings_complete_receiving"] = "Completado";
$lang["receivings_confirm_cancel_receiving"] = "Esta seguro que quiere eliminar esta recepción? Todos los items se borraran.";
$lang["receivings_confirm_delete"] = "Esta seguro que quiere borrar esta recepción? Esta acción no se puede deshacer.";
$lang["receivings_confirm_finish_receiving"] = "Esta seguro que quiere enviar esta recepción? Esto no se puede deshacer.";
$lang["receivings_cost"] = "Costo";
$lang["receivings_date"] = "Fecha de Recibido";
$lang["receivings_date_required"] = "Se debe de agregar la fecha correcta.";
$lang["receivings_date_type"] = "Fecha es un campo obligatorio.";
$lang["receivings_delete_entire_sale"] = "Borrar Venta Completa";
$lang["receivings_discount"] = "Descuento";
$lang["receivings_edit"] = "Editar";
$lang["receivings_edit_sale"] = "Editar Recepción";
$lang["receivings_employee"] = "Empleado";
$lang["receivings_error_editing_item"] = "Fallo la edición del item.";
$lang["receivings_error_requisition"] = "No se puede mover el inventario desde o hacia la misma Ubicación.";
$lang["receivings_find_or_scan_item"] = "Encontrar o Escanear Articulo";
$lang["receivings_find_or_scan_item_or_receipt"] = "Encontrar o Escanear Articulo o Recibo";
$lang["receivings_id"] = "ID de Recepción";
$lang["receivings_item_name"] = "Nombre del Articulo";
$lang["receivings_mode"] = "Modo de Recepción";
$lang["receivings_new_supplier"] = "Nuevo Proveedor";
$lang["receivings_one_or_multiple"] = "recepción(es)";
$lang["receivings_print_after_sale"] = "Imprimir después de la Venta";
$lang["receivings_quantity"] = "Cant.";
$lang["receivings_receipt"] = "Recibo de Recepcion";
$lang["receivings_receipt_number"] = "Recepción #";
$lang["receivings_receiving"] = "Recibir";
$lang["receivings_reference"] = "Referencia";
$lang["receivings_register"] = "Recepción de Artículos";
$lang["receivings_requisition"] = "Requisición";
$lang["receivings_return"] = "Devolución";
$lang["receivings_select_supplier"] = "Seleccionar Proveedor (Opcional)";
$lang["receivings_ship_pack"] = "Empaque de Envio";
$lang["receivings_start_typing_supplier_name"] = "Empiece a escribir el nombre del Proveedor...";
$lang["receivings_stock"] = "Inventario";
$lang["receivings_stock_destination"] = "Destino del Inventario";
$lang["receivings_stock_locaiton"] = "Ubicación del Inventario";
$lang["receivings_stock_source"] = "Origen del Inventario";
$lang["receivings_successfully_deleted"] = "Se ha borrado exitosamente";
$lang["receivings_successfully_updated"] = "Recepción actualizada exitosamente";
$lang["receivings_supplier"] = "Proveedor";
$lang["receivings_supplier_address"] = "Dirección";
$lang["receivings_supplier_email"] = "Email";
$lang["receivings_supplier_location"] = "Ubicación";
$lang["receivings_total"] = "Total";
$lang["receivings_transaction_failed"] = "Transacción de Recepción falló.";
$lang["receivings_unable_to_add_item"] = "Agregar Articulo a Recepción falló.";
$lang["receivings_unsuccessfully_updated"] = "Actualización de Recepción falló.";
$lang["receivings_update"] = "Actualizar";
<?php
$lang["receivings_cancel_receiving"] = "";
$lang["receivings_cannot_be_deleted"] = "";
$lang["receivings_comments"] = "";
$lang["receivings_complete_receiving"] = "";
$lang["receivings_confirm_cancel_receiving"] = "";
$lang["receivings_confirm_delete"] = "";
$lang["receivings_confirm_finish_receiving"] = "";
$lang["receivings_cost"] = "";
$lang["receivings_date"] = "";
$lang["receivings_date_required"] = "";
$lang["receivings_date_type"] = "";
$lang["receivings_delete_entire_sale"] = "";
$lang["receivings_discount"] = "";
$lang["receivings_edit"] = "";
$lang["receivings_edit_sale"] = "";
$lang["receivings_employee"] = "";
$lang["receivings_error_editing_item"] = "";
$lang["receivings_error_requisition"] = "";
$lang["receivings_find_or_scan_item"] = "";
$lang["receivings_find_or_scan_item_or_receipt"] = "";
$lang["receivings_id"] = "";
$lang["receivings_item_name"] = "";
$lang["receivings_mode"] = "";
$lang["receivings_new_supplier"] = "";
$lang["receivings_one_or_multiple"] = "";
$lang["receivings_print_after_sale"] = "";
$lang["receivings_quantity"] = "";
$lang["receivings_receipt"] = "";
$lang["receivings_receipt_number"] = "";
$lang["receivings_receiving"] = "";
$lang["receivings_reference"] = "";
$lang["receivings_register"] = "";
$lang["receivings_requisition"] = "";
$lang["receivings_return"] = "";
$lang["receivings_select_supplier"] = "";
$lang["receivings_ship_pack"] = "";
$lang["receivings_start_typing_supplier_name"] = "";
$lang["receivings_stock"] = "";
$lang["receivings_stock_destination"] = "";
$lang["receivings_stock_locaiton"] = "";
$lang["receivings_stock_source"] = "";
$lang["receivings_successfully_deleted"] = "";
$lang["receivings_successfully_updated"] = "";
$lang["receivings_supplier"] = "";
$lang["receivings_supplier_address"] = "";
$lang["receivings_supplier_email"] = "";
$lang["receivings_supplier_location"] = "";
$lang["receivings_total"] = "";
$lang["receivings_transaction_failed"] = "";
$lang["receivings_unable_to_add_item"] = "";
$lang["receivings_unsuccessfully_updated"] = "";
$lang["receivings_update"] = "";

View File

@@ -1,4 +1,5 @@
<?php
<?php
$lang["reports_all"] = "Todas";
$lang["reports_authority"] = "Autoridad";
$lang["reports_canceled"] = "Cancelado";
@@ -10,10 +11,10 @@ $lang["reports_code_invoice"] = "INV";
$lang["reports_code_pos"] = "POS";
$lang["reports_code_quote"] = "Q";
$lang["reports_code_return"] = "RET";
$lang["reports_code_type"] = "Tipo";
$lang["reports_code_work_order"] = "OT";
$lang["reports_comments"] = "Comentarios";
$lang["reports_complete"] = "Ventas y Devoluciones Completadas";
$lang["reports_code_type"] = "";
$lang["reports_code_work_order"] = "";
$lang["reports_comments"] = "";
$lang["reports_complete"] = "";
$lang["reports_completed_sales"] = "";
$lang["reports_confirm_delete"] = "";
$lang["reports_confirm_restore"] = "";

View File

@@ -1,4 +1,5 @@
<?php
<?php
$lang["common_address_1"] = "ที่อยู่";
$lang["common_address_2"] = "ที่อยู่ (เพิ่มเติม)";
$lang["common_city"] = "อำเภอ";
@@ -27,8 +28,8 @@ $lang["common_gender"] = "เพศ";
$lang["common_gender_female"] = "หญิง";
$lang["common_gender_male"] = "ชาย";
$lang["common_gender_undefined"] = "";
$lang["common_icon"] = "ไอคอน";
$lang["common_id"] = "ไอดี";
$lang["common_icon"] = "";
$lang["common_id"] = "ID";
$lang["common_import"] = "นำเข้า";
$lang["common_import_change_file"] = "เปลี่ยน";
$lang["common_import_csv"] = "นำเข้าไฟล์ CSV";
@@ -41,8 +42,8 @@ $lang["common_last_name_required"] = "นามสกุล จำเป็น
$lang["common_last_page"] = "ลำดับสุดท้าย";
$lang["common_learn_about_project"] = "เพื่อศึกษาข้อมูลล่าสุดของโครงการ";
$lang["common_list_of"] = "รายการ";
$lang["common_logo"] = "โลโก้";
$lang["common_logo_mark"] = "เครื่องหมาย";
$lang["common_logo"] = "";
$lang["common_logo_mark"] = "";
$lang["common_logout"] = "ออกจากระบบ";
$lang["common_migration_needed"] = "การย้ายฐานข้อมูลไปยัง %1 จะเริ่มขึ้นหลังจากเข้าสู่ระบบ";
$lang["common_new"] = "สร้างใหม่";
@@ -63,8 +64,8 @@ $lang["common_return_policy"] = "นโยบายคืนสินค้า";
$lang["common_search"] = "ค้นหา";
$lang["common_search_options"] = "ตัวเลือกการค้นหา";
$lang["common_searched_for"] = "การค้นหา";
$lang["common_software_short"] = "โอเอสพีโอเอส";
$lang["common_software_title"] = "โอเพ่นซอร์สพอยออฟเซล";
$lang["common_software_short"] = "";
$lang["common_software_title"] = "";
$lang["common_state"] = "จังหวัด";
$lang["common_submit"] = "ส่งข้อมูล";
$lang["common_total_spent"] = "ยอดสั่งซื้อทั้งหมด";

View File

@@ -1,4 +1,5 @@
<?php
<?php
$lang["config_address"] = "ที่อยู่";
$lang["config_address_required"] = "ที่อยู่ต้องกรอก";
$lang["config_all_set"] = "การตั้งค่าอนุญาตไฟล์ทั้งหมดถูกต้อง!";
@@ -126,7 +127,7 @@ $lang["config_financial_year_may"] = "วันที่ 1 พฤษภาคม
$lang["config_financial_year_nov"] = "วันที่ 1 พฤศจิกายน";
$lang["config_financial_year_oct"] = "วันที่ 1 ตุลาคม";
$lang["config_financial_year_sep"] = "วันที่ 1 กันยายน";
$lang["config_floating_labels"] = "Floating Labels";
$lang["config_floating_labels"] = "";
$lang["config_gcaptcha_enable"] = "ขอรหัสยืนยันใหม่ เพื่อเข้าระบบ";
$lang["config_gcaptcha_secret_key"] = "รหัสลับ สำหรับรหัสยืนยัน";
$lang["config_gcaptcha_secret_key_required"] = "จำเป็นต้องระบุ รหัสลับ สำหรับรหัสยืนยัน";
@@ -146,7 +147,7 @@ $lang["config_image_restrictions"] = "ข้อจำกัดของไฟล
$lang["config_include_hsn"] = "เพิ่มการรองรับ HSN Codes";
$lang["config_info"] = "ข้อมูลร้านค้า";
$lang["config_info_configuration"] = "ข้อมูลร้านค้า";
$lang["config_input_groups"] = "Input Groups";
$lang["config_input_groups"] = "";
$lang["config_integrations"] = "การเข้าร่วม";
$lang["config_integrations_configuration"] = "การเข้าร่วมกับบุคคลภายนอก";
$lang["config_invoice"] = "ใบแจ้งหนี้";
@@ -176,7 +177,7 @@ $lang["config_locale_info"] = "ข้อมูลเขตพื้นที่"
$lang["config_location"] = "สินค้าคงคลัง";
$lang["config_location_configuration"] = "ตำแหน่งสินค้าคงคลัง";
$lang["config_location_info"] = "ข้อมูลตำแหน่งสินค้าคงคลัง";
$lang["config_login_form"] = "รูปแบบแบบฟอร์มการเข้าระบบ";
$lang["config_login_form"] = "";
$lang["config_logout"] = "ต้องการสำรองข้อมูลก่อนออกจากระบบหรือไม่? [OK] สำรองข้อมูล / [Cancel] ออกจากระบบ";
$lang["config_mailchimp"] = "ระบบส่งอีเมล์เมล์ชิม";
$lang["config_mailchimp_api_key"] = "API Key สำหรับระบบส่งอีเมล์เมล์ชิม";
@@ -291,7 +292,7 @@ $lang["config_tax_decimals"] = "จำนวนทศนิยมภาษี";
$lang["config_tax_id"] = "เลขประจำตัวผู้เสียภาษี";
$lang["config_tax_included"] = "รวมภาษีแล้ว";
$lang["config_theme"] = "Theme";
$lang["config_theme_preview"] = "ดูตัวอย่างธีม:";
$lang["config_theme_preview"] = "";
$lang["config_thousands_separator"] = "ตัวคั่นหลักพัน";
$lang["config_timezone"] = "โซนเวลา";
$lang["config_timezone_error"] = "เขตเวลาของระบบ OSPOS แตกต่างกับเขตเวลาปัจจุบันของคุณ";

View File

@@ -1,12 +1,13 @@
<?php
<?php
$lang["login_gcaptcha"] = "ฉันไม่ใช่หุ่นยนต์";
$lang["login_go"] = "ไป";
$lang["login_invalid_gcaptcha"] = "กรุณาแสดงตัวตนว่าคุณไม่ใช่หุ่นยนต์";
$lang["login_invalid_installation"] = "การติดตั้งไม่ถูกต้องตรวจสอบการตั้งค่าที่ไฟล์ php.ini ของคุณ";
$lang["login_invalid_username_and_password"] = "ชื่อผู้ใช้งานและ/หรือรหัสผ่านเข้าระบบไม่ถูกต้อง";
$lang["login_invalid_username_and_password"] = "ชื่อผู้ใช้/รหัส ไม่ถูกต้อง";
$lang["login_login"] = "ลงชื่อเข้าใช้";
$lang["login_logout"] = "ออกจากระบบ";
$lang["login_migration_needed"] = "การย้ายฐานข้อมูลไปยัง %1 จะเริ่มต้นหลังจากเข้าสู่ระบบ";
$lang["login_logout"] = "";
$lang["login_migration_needed"] = "";
$lang["login_password"] = "รหัสผ่าน";
$lang["login_username"] = "ชื่อผู้ใช้";
$lang["login_welcome"] = "ยินดีต้อนรับสู่ %1!";
$lang["login_welcome"] = "";

View File

@@ -1,11 +1,11 @@
<!DOCTYPE html>
<html>
<head>
<title>403 Yasaklı</title>
<title>403 Forbidden</title>
</head>
<body>
<p>Dizin erişimi yasaktır.</p>
<p>Directory access is forbidden.</p>
</body>
</html>
</html>

View File

@@ -18,11 +18,10 @@ class Employee extends Person
return ($this->db->get()->num_rows() == 1);
}
public function username_exists($employee_id, $username)
public function username_exists($username)
{
$this->db->from('employees');
$this->db->where('employees.username', $username);
$this->db->where('employees.person_id <>', $employee_id);
return ($this->db->get()->num_rows() == 1);
}

View File

@@ -209,10 +209,16 @@ $(document).ready(function()
last_name: 'required',
username:
{
<?php
if($person_info->person_id == "")
{
?>
remote: "<?php echo site_url($controller_name . '/check_username')?>",
<?php
}
?>
required: true,
minlength: 5,
remote: '<?php echo site_url("$controller_name/check_username/$employee_id")?>'
minlength: 5
},
password:
{

View File

@@ -22,8 +22,7 @@
"dompdf/dompdf": "^0.8.5",
"tamtamchik/namecase": "^1.0",
"paragonie/random_compat": "^2.0",
"vlucas/phpdotenv": "^2.4",
"eventsauce/eventsauce": "^0.8.2"
"vlucas/phpdotenv": "^2.4"
},
"require-dev": {
"mikey179/vfsstream": "1.1.*",

635
composer.lock generated
View File

@@ -4,64 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "927023ac824f2a8745cb8d1dc496bf05",
"content-hash": "39829ee57ca769cd2030341ad186fbe7",
"packages": [
{
"name": "brick/math",
"version": "0.9.2",
"source": {
"type": "git",
"url": "https://github.com/brick/math.git",
"reference": "dff976c2f3487d42c1db75a3b180e2b9f0e72ce0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/brick/math/zipball/dff976c2f3487d42c1db75a3b180e2b9f0e72ce0",
"reference": "dff976c2f3487d42c1db75a3b180e2b9f0e72ce0",
"shasum": ""
},
"require": {
"ext-json": "*",
"php": "^7.1 || ^8.0"
},
"require-dev": {
"php-coveralls/php-coveralls": "^2.2",
"phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.0",
"vimeo/psalm": "4.3.2"
},
"type": "library",
"autoload": {
"psr-4": {
"Brick\\Math\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "Arbitrary-precision arithmetic library",
"keywords": [
"Arbitrary-precision",
"BigInteger",
"BigRational",
"arithmetic",
"bigdecimal",
"bignum",
"brick",
"math"
],
"support": {
"issues": "https://github.com/brick/math/issues",
"source": "https://github.com/brick/math/tree/0.9.2"
},
"funding": [
{
"url": "https://tidelift.com/funding/github/packagist/brick/math",
"type": "tidelift"
}
],
"time": "2021-01-20T22:51:39+00:00"
},
{
"name": "codeigniter/framework",
"version": "3.1.11",
@@ -174,71 +118,18 @@
},
"time": "2020-08-30T22:54:22+00:00"
},
{
"name": "eventsauce/eventsauce",
"version": "0.8.2",
"source": {
"type": "git",
"url": "https://github.com/EventSaucePHP/EventSauce.git",
"reference": "3c413662af7e37c7a2ca4fd2b1cfe9365a7b6dae"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/EventSaucePHP/EventSauce/zipball/3c413662af7e37c7a2ca4fd2b1cfe9365a7b6dae",
"reference": "3c413662af7e37c7a2ca4fd2b1cfe9365a7b6dae",
"shasum": ""
},
"require": {
"php": "^7.2|^8.0",
"ramsey/uuid": "^3|^4",
"symfony/yaml": "^3.2|^4.0|^5.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.15",
"phpstan/phpstan": "^0.11.16|^0.12.52",
"phpunit/phpunit": "^7.0|^8.0|^9.3"
},
"type": "library",
"autoload": {
"psr-4": {
"EventSauce\\EventSourcing\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Frank de Jonge",
"email": "info@frenky.net"
}
],
"description": "Event sourcing library.",
"support": {
"issues": "https://github.com/EventSaucePHP/EventSauce/issues",
"source": "https://github.com/EventSaucePHP/EventSauce/tree/0.8.2"
},
"funding": [
{
"url": "https://github.com/frankdejonge",
"type": "github"
}
],
"time": "2020-11-01T15:25:34+00:00"
},
{
"name": "paragonie/random_compat",
"version": "v2.0.20",
"version": "v2.0.19",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
"reference": "0f1f60250fccffeaf5dda91eea1c018aed1adc2a"
"reference": "446fc9faa5c2a9ddf65eb7121c0af7e857295241"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/0f1f60250fccffeaf5dda91eea1c018aed1adc2a",
"reference": "0f1f60250fccffeaf5dda91eea1c018aed1adc2a",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/446fc9faa5c2a9ddf65eb7121c0af7e857295241",
"reference": "446fc9faa5c2a9ddf65eb7121c0af7e857295241",
"shasum": ""
},
"require": {
@@ -279,7 +170,7 @@
"issues": "https://github.com/paragonie/random_compat/issues",
"source": "https://github.com/paragonie/random_compat"
},
"time": "2021-04-17T09:33:01+00:00"
"time": "2020-10-15T10:06:57+00:00"
},
{
"name": "phenx/php-font-lib",
@@ -366,182 +257,6 @@
},
"time": "2019-09-11T20:02:13+00:00"
},
{
"name": "ramsey/collection",
"version": "1.2.1",
"source": {
"type": "git",
"url": "https://github.com/ramsey/collection.git",
"reference": "eaca1dc1054ddd10cbd83c1461907bee6fb528fa"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ramsey/collection/zipball/eaca1dc1054ddd10cbd83c1461907bee6fb528fa",
"reference": "eaca1dc1054ddd10cbd83c1461907bee6fb528fa",
"shasum": ""
},
"require": {
"php": "^7.3 || ^8",
"symfony/polyfill-php81": "^1.23"
},
"require-dev": {
"captainhook/captainhook": "^5.3",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"ergebnis/composer-normalize": "^2.6",
"fakerphp/faker": "^1.5",
"hamcrest/hamcrest-php": "^2",
"jangregor/phpstan-prophecy": "^0.8",
"mockery/mockery": "^1.3",
"phpspec/prophecy-phpunit": "^2.0",
"phpstan/extension-installer": "^1",
"phpstan/phpstan": "^0.12.32",
"phpstan/phpstan-mockery": "^0.12.5",
"phpstan/phpstan-phpunit": "^0.12.11",
"phpunit/phpunit": "^8.5 || ^9",
"psy/psysh": "^0.10.4",
"slevomat/coding-standard": "^6.3",
"squizlabs/php_codesniffer": "^3.5",
"vimeo/psalm": "^4.4"
},
"type": "library",
"autoload": {
"psr-4": {
"Ramsey\\Collection\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Ben Ramsey",
"email": "ben@benramsey.com",
"homepage": "https://benramsey.com"
}
],
"description": "A PHP library for representing and manipulating collections.",
"keywords": [
"array",
"collection",
"hash",
"map",
"queue",
"set"
],
"support": {
"issues": "https://github.com/ramsey/collection/issues",
"source": "https://github.com/ramsey/collection/tree/1.2.1"
},
"funding": [
{
"url": "https://github.com/ramsey",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/ramsey/collection",
"type": "tidelift"
}
],
"time": "2021-08-06T03:41:06+00:00"
},
{
"name": "ramsey/uuid",
"version": "4.2.0",
"source": {
"type": "git",
"url": "https://github.com/ramsey/uuid.git",
"reference": "7231612a5221f5524d3575bebdce20eeef8547a1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/7231612a5221f5524d3575bebdce20eeef8547a1",
"reference": "7231612a5221f5524d3575bebdce20eeef8547a1",
"shasum": ""
},
"require": {
"brick/math": "^0.8 || ^0.9",
"ext-json": "*",
"php": "^7.2 || ^8",
"ramsey/collection": "^1.0",
"symfony/polyfill-ctype": "^1.8"
},
"replace": {
"rhumsaa/uuid": "self.version"
},
"require-dev": {
"captainhook/captainhook": "^5.10",
"captainhook/plugin-composer": "^5.3",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"doctrine/annotations": "^1.8",
"ergebnis/composer-normalize": "^2.15",
"mockery/mockery": "^1.3",
"moontoast/math": "^1.1",
"paragonie/random-lib": "^2",
"php-mock/php-mock": "^2.2",
"php-mock/php-mock-mockery": "^1.3",
"php-parallel-lint/php-parallel-lint": "^1.1",
"phpbench/phpbench": "^1.0",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^0.12",
"phpstan/phpstan-mockery": "^0.12",
"phpstan/phpstan-phpunit": "^0.12",
"phpunit/phpunit": "^8.5 || ^9",
"slevomat/coding-standard": "^7.0",
"squizlabs/php_codesniffer": "^3.5",
"vimeo/psalm": "^4.9"
},
"suggest": {
"ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.",
"ext-ctype": "Enables faster processing of character classification using ctype functions.",
"ext-gmp": "Enables faster math with arbitrary-precision integers using GMP.",
"ext-uuid": "Enables the use of PeclUuidTimeGenerator and PeclUuidRandomGenerator.",
"paragonie/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
"ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type."
},
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "4.x-dev"
},
"captainhook": {
"force-install": true
}
},
"autoload": {
"psr-4": {
"Ramsey\\Uuid\\": "src/"
},
"files": [
"src/functions.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "A PHP library for generating and working with universally unique identifiers (UUIDs).",
"keywords": [
"guid",
"identifier",
"uuid"
],
"support": {
"issues": "https://github.com/ramsey/uuid/issues",
"source": "https://github.com/ramsey/uuid/tree/4.2.0"
},
"funding": [
{
"url": "https://github.com/ramsey",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/ramsey/uuid",
"type": "tidelift"
}
],
"time": "2021-08-06T22:30:43+00:00"
},
{
"name": "sabberworm/php-css-parser",
"version": "8.3.1",
@@ -591,85 +306,18 @@
},
"time": "2020-06-01T09:10:00+00:00"
},
{
"name": "symfony/deprecation-contracts",
"version": "v2.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
"reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627",
"reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "2.4-dev"
},
"thanks": {
"name": "symfony/contracts",
"url": "https://github.com/symfony/contracts"
}
},
"autoload": {
"files": [
"function.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2021-03-23T23:28:01+00:00"
},
{
"name": "symfony/polyfill-ctype",
"version": "v1.23.0",
"version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
"reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
"reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f4ba089a5b6366e453971d3aad5fe8e897b37f41",
"reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41",
"shasum": ""
},
"require": {
@@ -681,7 +329,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.23-dev"
"dev-main": "1.20-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -719,7 +367,7 @@
"portable"
],
"support": {
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0"
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.20.0"
},
"funding": [
{
@@ -735,161 +383,7 @@
"type": "tidelift"
}
],
"time": "2021-02-19T12:13:01+00:00"
},
{
"name": "symfony/polyfill-php81",
"version": "v1.23.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php81.git",
"reference": "e66119f3de95efc359483f810c4c3e6436279436"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/e66119f3de95efc359483f810c4c3e6436279436",
"reference": "e66119f3de95efc359483f810c4c3e6436279436",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.23-dev"
},
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Php81\\": ""
},
"files": [
"bootstrap.php"
],
"classmap": [
"Resources/stubs"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"polyfill",
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php81/tree/v1.23.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2021-05-21T13:25:03+00:00"
},
{
"name": "symfony/yaml",
"version": "v5.3.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "4500fe63dc9c6ffc32d3b1cb0448c329f9c814b7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/4500fe63dc9c6ffc32d3b1cb0448c329f9c814b7",
"reference": "4500fe63dc9c6ffc32d3b1cb0448c329f9c814b7",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"symfony/deprecation-contracts": "^2.1",
"symfony/polyfill-ctype": "~1.8"
},
"conflict": {
"symfony/console": "<4.4"
},
"require-dev": {
"symfony/console": "^4.4|^5.0"
},
"suggest": {
"symfony/console": "For validating YAML files using the lint command"
},
"bin": [
"Resources/bin/yaml-lint"
],
"type": "library",
"autoload": {
"psr-4": {
"Symfony\\Component\\Yaml\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/yaml/tree/v5.3.6"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2021-07-29T06:20:01+00:00"
"time": "2020-10-23T14:02:19+00:00"
},
{
"name": "tamtamchik/namecase",
@@ -956,16 +450,16 @@
},
{
"name": "vlucas/phpdotenv",
"version": "v2.6.7",
"version": "v2.6.6",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
"reference": "b786088918a884258c9e3e27405c6a4cf2ee246e"
"reference": "e1d57f62db3db00d9139078cbedf262280701479"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/b786088918a884258c9e3e27405c6a4cf2ee246e",
"reference": "b786088918a884258c9e3e27405c6a4cf2ee246e",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/e1d57f62db3db00d9139078cbedf262280701479",
"reference": "e1d57f62db3db00d9139078cbedf262280701479",
"shasum": ""
},
"require": {
@@ -975,7 +469,7 @@
"require-dev": {
"ext-filter": "*",
"ext-pcre": "*",
"phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20"
"phpunit/phpunit": "^4.8.35 || ^5.7.27"
},
"suggest": {
"ext-filter": "Required to use the boolean validator.",
@@ -1016,7 +510,7 @@
],
"support": {
"issues": "https://github.com/vlucas/phpdotenv/issues",
"source": "https://github.com/vlucas/phpdotenv/tree/v2.6.7"
"source": "https://github.com/vlucas/phpdotenv/tree/v2.6.6"
},
"funding": [
{
@@ -1028,7 +522,7 @@
"type": "tidelift"
}
],
"time": "2021-01-20T14:39:13+00:00"
"time": "2020-07-14T17:54:18+00:00"
}
],
"packages-dev": [
@@ -1245,16 +739,16 @@
},
{
"name": "nikic/php-parser",
"version": "v4.12.0",
"version": "v4.10.4",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "6608f01670c3cc5079e18c1dab1104e002579143"
"reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6608f01670c3cc5079e18c1dab1104e002579143",
"reference": "6608f01670c3cc5079e18c1dab1104e002579143",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c6d052fc58cb876152f89f532b95a8d7907e7f0e",
"reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e",
"shasum": ""
},
"require": {
@@ -1295,9 +789,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v4.12.0"
"source": "https://github.com/nikic/PHP-Parser/tree/v4.10.4"
},
"time": "2021-07-21T10:44:31+00:00"
"time": "2020-12-20T10:01:03+00:00"
},
{
"name": "phar-io/manifest",
@@ -1569,16 +1063,16 @@
},
{
"name": "phpspec/prophecy",
"version": "1.13.0",
"version": "1.12.2",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
"reference": "be1996ed8adc35c3fd795488a653f4b518be70ea"
"reference": "245710e971a030f42e08f4912863805570f23d39"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea",
"reference": "be1996ed8adc35c3fd795488a653f4b518be70ea",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/245710e971a030f42e08f4912863805570f23d39",
"reference": "245710e971a030f42e08f4912863805570f23d39",
"shasum": ""
},
"require": {
@@ -1630,9 +1124,9 @@
],
"support": {
"issues": "https://github.com/phpspec/prophecy/issues",
"source": "https://github.com/phpspec/prophecy/tree/1.13.0"
"source": "https://github.com/phpspec/prophecy/tree/1.12.2"
},
"time": "2021-03-17T13:42:18+00:00"
"time": "2020-12-19T10:15:11+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -1703,16 +1197,16 @@
},
{
"name": "phpunit/php-file-iterator",
"version": "2.0.4",
"version": "2.0.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
"reference": "28af674ff175d0768a5a978e6de83f697d4a7f05"
"reference": "4b49fb70f067272b659ef0174ff9ca40fdaa6357"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/28af674ff175d0768a5a978e6de83f697d4a7f05",
"reference": "28af674ff175d0768a5a978e6de83f697d4a7f05",
"url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/4b49fb70f067272b659ef0174ff9ca40fdaa6357",
"reference": "4b49fb70f067272b659ef0174ff9ca40fdaa6357",
"shasum": ""
},
"require": {
@@ -1751,7 +1245,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
"source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.4"
"source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.3"
},
"funding": [
{
@@ -1759,7 +1253,7 @@
"type": "github"
}
],
"time": "2021-07-19T06:46:01+00:00"
"time": "2020-11-30T08:25:21+00:00"
},
{
"name": "phpunit/php-text-template",
@@ -1867,16 +1361,16 @@
},
{
"name": "phpunit/php-token-stream",
"version": "3.1.3",
"version": "3.1.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
"reference": "9c1da83261628cb24b6a6df371b6e312b3954768"
"reference": "472b687829041c24b25f475e14c2f38a09edf1c2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9c1da83261628cb24b6a6df371b6e312b3954768",
"reference": "9c1da83261628cb24b6a6df371b6e312b3954768",
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/472b687829041c24b25f475e14c2f38a09edf1c2",
"reference": "472b687829041c24b25f475e14c2f38a09edf1c2",
"shasum": ""
},
"require": {
@@ -1914,7 +1408,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
"source": "https://github.com/sebastianbergmann/php-token-stream/tree/3.1.3"
"source": "https://github.com/sebastianbergmann/php-token-stream/tree/3.1.2"
},
"funding": [
{
@@ -1923,7 +1417,7 @@
}
],
"abandoned": true,
"time": "2021-07-26T12:15:06+00:00"
"time": "2020-11-30T08:38:46+00:00"
},
{
"name": "phpunit/phpunit",
@@ -2679,16 +2173,16 @@
},
{
"name": "theseer/tokenizer",
"version": "1.2.1",
"version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/theseer/tokenizer.git",
"reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
"reference": "75a63c33a8577608444246075ea0af0d052e452a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
"reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
"url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a",
"reference": "75a63c33a8577608444246075ea0af0d052e452a",
"shasum": ""
},
"require": {
@@ -2717,7 +2211,7 @@
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
"support": {
"issues": "https://github.com/theseer/tokenizer/issues",
"source": "https://github.com/theseer/tokenizer/tree/1.2.1"
"source": "https://github.com/theseer/tokenizer/tree/master"
},
"funding": [
{
@@ -2725,39 +2219,34 @@
"type": "github"
}
],
"time": "2021-07-28T10:34:58+00:00"
"time": "2020-07-12T23:59:07+00:00"
},
{
"name": "webmozart/assert",
"version": "1.10.0",
"version": "1.9.1",
"source": {
"type": "git",
"url": "https://github.com/webmozarts/assert.git",
"reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
"url": "https://github.com/webmozart/assert.git",
"reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
"reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
"url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
"reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
"shasum": ""
},
"require": {
"php": "^7.2 || ^8.0",
"php": "^5.3.3 || ^7.0 || ^8.0",
"symfony/polyfill-ctype": "^1.8"
},
"conflict": {
"phpstan/phpstan": "<0.12.20",
"vimeo/psalm": "<4.6.1 || 4.6.2"
"vimeo/psalm": "<3.9.1"
},
"require-dev": {
"phpunit/phpunit": "^8.5.13"
"phpunit/phpunit": "^4.8.36 || ^7.5.13"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.10-dev"
}
},
"autoload": {
"psr-4": {
"Webmozart\\Assert\\": "src/"
@@ -2780,10 +2269,10 @@
"validate"
],
"support": {
"issues": "https://github.com/webmozarts/assert/issues",
"source": "https://github.com/webmozarts/assert/tree/1.10.0"
"issues": "https://github.com/webmozart/assert/issues",
"source": "https://github.com/webmozart/assert/tree/master"
},
"time": "2021-03-09T10:59:23+00:00"
"time": "2020-07-08T17:02:28+00:00"
}
],
"aliases": [],
@@ -2795,5 +2284,5 @@
"php": "^7.2"
},
"platform-dev": [],
"plugin-api-version": "2.1.0"
"plugin-api-version": "2.0.0"
}