mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-24 08:20:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove nominatim duplicates (#805)

Browse Source 
Set default notification popup position to center bottom
This commit is contained in:
jekkos
2016-08-30 08:42:49 +02:00
parent a2d2965785
commit 96004f5699
7 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/views/partial/header.php
View File

@@ -73,7 +73,7 @@
<link rel="stylesheet" type="text/css" href="dist/style.css"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=16b34f66f6"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=2ea05557c1"></script>
<!-- end minjs template tags -->
<?php endif; ?>

4
database/database.sql
View File

@@ -70,8 +70,8 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('msg_uid', ''),
('msg_src', ''),
('msg_pwd', ''),
('notify_horizontal_position', 'right'),
('notify_vertical_position', 'top'),
('notify_horizontal_position', 'center'),
('notify_vertical_position', 'bottom'),
('payment_options_order', 'cashdebitcredit'),
('protocol', 'mail'),
('mailpath', '/usr/sbin/sendmail'),

4
database/migrate_phppos_dist.sql
View File

@@ -70,8 +70,8 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('msg_uid', ''),
('msg_src', ''),
('msg_pwd', ''),
('notify_horizontal_position', 'right'),
('notify_vertical_position', 'top'),
('notify_horizontal_position', 'center'),
('notify_vertical_position', 'bottom'),
('payment_options_order', 'cashdebitcredit'),
('protocol', 'mail'),
('mailpath', '/usr/sbin/sendmail'),

4
database/tables.sql
View File

@@ -70,8 +70,8 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('msg_uid', ''),
('msg_src', ''),
('msg_pwd', ''),
('notify_horizontal_position', 'right'),
('notify_vertical_position', 'top'),
('notify_horizontal_position', 'center'),
('notify_vertical_position', 'bottom'),
('payment_options_order', 'cashdebitcredit'),
('protocol', 'mail'),
('mailpath', '/usr/sbin/sendmail'),

36
dist/opensourcepos.js vendored
View File

@@ -49433,20 +49433,6 @@ $(document).ready(function() {
return fields[0] + (fields[1] ? ' (' + fields[1] + ')' : '');
};
var unique = function(parsed) {
var filtered = []
$.each(parsed, function(index, element)
{
filtered = $.map(filtered, function(el, ind)
{
return el.label == element.label ? null : el;
});
filtered.push(element);
});
return filtered;
};
return function(data)
{
var parsed = [];
@@ -49460,11 +49446,11 @@ $(document).ready(function() {
});
parsed[index] = {
label: row.join(", "),
results: _.uniq(row),
results: row,
value: address[field_name]
};
});
return unique(parsed);
return parsed;
};
};
@@ -49486,6 +49472,20 @@ $(document).ready(function() {
};
var unique = function(parsed) {
var filtered = [];
$.each(parsed, function(index, element)
{
filtered = $.map(filtered, function(el, ind)
{
return el.label == element.label ? null : el;
});
filtered.push(element);
});
return filtered;
};
$.each(options.fields, function(key, value)
{
var handle_field_completion = handle_auto_completion(value.dependencies);
@@ -49504,9 +49504,9 @@ $(document).ready(function() {
dataType: "json",
data: $.extend(request_params, params()),
success: function(data) {
response($.map(data, function(item) {
response(unique($.map(data, function(item) {
return (create_parser(key, (value.response && value.response.format) || value.dependencies))(data)
}))
})))
}
});
},

4
dist/opensourcepos.min.js vendored
View File

File diff suppressed because one or more lines are too long

36
js/nominatim.autocomplete.js
View File

@@ -36,20 +36,6 @@
return fields[0] + (fields[1] ? ' (' + fields[1] + ')' : '');
};
var unique = function(parsed) {
var filtered = []
$.each(parsed, function(index, element)
{
filtered = $.map(filtered, function(el, ind)
{
return el.label == element.label ? null : el;
});
filtered.push(element);
});
return filtered;
};
return function(data)
{
var parsed = [];
@@ -63,11 +49,11 @@
});
parsed[index] = {
label: row.join(", "),
results: _.uniq(row),
results: row,
value: address[field_name]
};
});
return unique(parsed);
return parsed;
};
};
@@ -89,6 +75,20 @@
};
var unique = function(parsed) {
var filtered = [];
$.each(parsed, function(index, element)
{
filtered = $.map(filtered, function(el, ind)
{
return el.label == element.label ? null : el;
});
filtered.push(element);
});
return filtered;
};
$.each(options.fields, function(key, value)
{
var handle_field_completion = handle_auto_completion(value.dependencies);
@@ -107,9 +107,9 @@
dataType: "json",
data: $.extend(request_params, params()),
success: function(data) {
response($.map(data, function(item) {
response(unique($.map(data, function(item) {
return (create_parser(key, (value.response && value.response.format) || value.dependencies))(data)
}))
})))
}
});
},