mirror of
https://github.com/opensourcepos/opensourcepos.git
synced 2026-04-20 23:13:00 -04:00
- Merge Config and Core File Changes 4.6.3 > 4.6.4 - Merge Config and Core File Changes 4.6.4 > 4.7.0 - Added app\Config\WorkerMode.php - Merge Config and Core File Changes Not previously merged - Added app\Config\Hostnames.php - Corrected incorrect CSS property used in invoice.php view. - Corrected unknown CSS properties used in register.php view. - Used shorthand CSS in debug.css - Corrected indentation in barcode_sheet.php view. - Corrected indentation in footer.php view. - Corrected indentation in invoice_email.php view. - Replaced obsolete attributes with CSS style attributes in barcode_sheet.php - Replaced obsolete attribute in error_exception.php - Replaced obsolete attribute in invoice_email.php - Replaced obsolete attribute in quote_email.php - Replaced obsolete attributes in work_order_email.php - Fixed indentation in system_info.php - Replaced <strong> tag outside <p> tags, which isn't allowed, with style attributes. - Simplified js return logic and indentation fixes in tax_categories.php - Simplified js return logic in tax_codes.php - Simplified js return logic in tax_jurisdictions.php - Removed unnecessary labels in manage views. - Rewrite JavaScript function and PHP to be more readable in bar.php, hbar.php, line.php and pie.php - Added type declarations, return types and an import to app\Config\Services - Updated Attribute.php parameter type - Updated Receiving_lib.php parameter type - Updated Receivings.php parameter types and updated PHPdocs - Updated tabular_helper.php parameter types and updated PHPdocs - Added type declarations and corrected PHPdocs in url_helper.php - Added return types to functions - Revert $objectSrc value in ContentSecurityPolicy.php - Correct return type in Customer->get_stats() - Correct return type in Item->get_info_by_id_or_number() - Correct misspelling in border-spacing - Added missing css style semicolons - Resolve operator precedence ambiguity. - Resolve column mismatch. - Added missing escaping in view. - Updated requirement for PHP 8.2 - Resolve unresolved conflicts - Added PHP 8.2 requirement to the README.md - Fixed bugs in display of UI - Fixed duplicated `>` in app\Views\Expenses\manage.php - Removed excess whitespace at the end of some lines in table_filter_persistence.php - Added missing `>` in app\Views\Expenses\manage.php - Corrected grammar in PHPdoc in table_filter_persistence.php - Remove bug causing `\` to be injected into the new giftcard value - Fix bug causing DROPDOWN Attribute Values to not save correctly - Added check for null in $normalizedItemId - Removing < PHP 8.2 from linting and tests - Update Linter to not include PHP 8.2 and 8.1 - Remove PHP 8.1 unit test cycle. - Update Bug Report Template - Update Composer files for CodeIgniter 4.7.2 - Updated INSTALL.md to reflect changes. --------- Signed-off-by: objec <objecttothis@gmail.com>
85 lines
2.5 KiB
PHP
85 lines
2.5 KiB
PHP
<?php
|
|
/**
|
|
* @var array $labels_1
|
|
* @var array $series_data_1
|
|
* @var bool $show_currency
|
|
* @var array $config
|
|
*/
|
|
?>
|
|
|
|
<script type="text/javascript">
|
|
// Labels and data series
|
|
var data = {
|
|
labels: <?= json_encode(esc($labels_1, 'js')) ?>,
|
|
series: <?= json_encode(esc($series_data_1, 'js')) ?>
|
|
};
|
|
|
|
// We are setting a few options for our chart and override the defaults
|
|
var options = {
|
|
|
|
// Specify a fixed width for the chart as a string (i.e. '100px' or '50%')
|
|
width: '100%',
|
|
|
|
// Specify a fixed height for the chart as a string (i.e. '100px' or '50%')
|
|
height: '100%',
|
|
|
|
// Padding of the chart drawing area to the container element and labels as a number or padding object {top: 5, right: 5, bottom: 5, left: 5}
|
|
chartPadding: 20,
|
|
|
|
// This option can be set to 'inside', 'outside' or 'center'.
|
|
// Show the labels on the border with the pie chart
|
|
labelPosition: 'outside',
|
|
labelDirection: 'explode',
|
|
|
|
<?php
|
|
$currency_symbol = esc($config['currency_symbol'], 'js');
|
|
$currency_prefix = '';
|
|
$currency_suffix = '';
|
|
|
|
if ($show_currency) {
|
|
if (is_right_side_currency_symbol()) {
|
|
$currency_suffix = $currency_symbol;
|
|
} else {
|
|
$currency_prefix = $currency_symbol;
|
|
}
|
|
}
|
|
?>
|
|
|
|
plugins: [
|
|
Chartist.plugins.tooltip({
|
|
transformTooltipTextFnc: function(value) {
|
|
return '<?= $currency_prefix ?>' + value + '<?= $currency_suffix ?>';
|
|
}
|
|
})
|
|
] };
|
|
|
|
var responsiveOptions = [
|
|
['screen and (min-width: 640px)', {
|
|
height: '80%',
|
|
chartPadding: 20
|
|
|
|
}]
|
|
/* ,
|
|
* ['screen and (min-width: 1024px)', {
|
|
* labelOffset: 80,
|
|
* chartPadding: 20
|
|
* }]
|
|
*/
|
|
];
|
|
|
|
chart = new Chartist.Pie('#chart1', data, options, responsiveOptions);
|
|
|
|
// Generate random colours for the pie sliced because Chartist is currently limited to 15 colours
|
|
chart.on('draw', function(data) {
|
|
if (data.type === 'slice') {
|
|
var r = Math.floor(Math.random() * 256);
|
|
var g = Math.floor(Math.random() * 256);
|
|
var b = Math.floor(Math.random() * 256);
|
|
|
|
data.element.attr({
|
|
style: 'fill: #' + ((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1)
|
|
});
|
|
}
|
|
});
|
|
</script>
|