mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-10 01:51:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

jQuery was one of three javascript files that were not being built correctly. This fixes the Javascript issues.

Browse Source
This commit is contained in:
Steve Ireland
2023-03-07 19:18:12 -05:00
parent b23573dda5
commit d0ddf798b9
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Gruntfile.js
View File

@@ -72,10 +72,10 @@ module.exports = function(grunt) {
},
minjs: {
options: {
starttag: '<!-- minjs injector:css -->',
starttag: '<!-- minjs injector:js -->',
},
files: {
'app/Views/partial/header.php': [ospos_min_css]
'app/Views/partial/header.php': [ospos_min_js]
},
},
css_login: {
@@ -126,7 +126,7 @@ module.exports = function(grunt) {
concat: {
js: {
options: {
separator: ';'
separator: '\n'
},
files: {
'tmp/opensourcepos.js': ['public/dist/jquery/jquery.js', 'tmp/opensourcepos_bower.js', 'public/js/*.js']

2
app/Views/partial/header.php
View File

@@ -39,7 +39,7 @@ $request = Services::request();
<?php if ($config['theme'] != 'flatly' && file_exists($_SERVER['DOCUMENT_ROOT'] . '/public/css/' . esc($config['theme']) . '.css')) { ?>
<link rel="stylesheet" type="text/css" href="<?php echo 'css/' . esc($config['theme']) . '.css' ?>"/>
<?php } ?>
<!-- minjs injector:css -->
<!-- minjs injector:js -->
<!-- endinjector -->
<?php endif; ?>

6
grunt045/Gruntfile.js
View File

@@ -13,11 +13,11 @@ module.exports = function(grunt) {
'dist/extensions/sticky-header/bootstrap-table-sticky-header.min.js',
'dist/extensions/sticky-header/bootstrap-table-sticky-header.css'
],
'chartist-plugin-axistitle': [ "./dist/chartist-plugin-axistitle.min.js"]
'chartist-plugin-axistitle': [ "dist/chartist-plugin-axistitle.min.js"]
},
dest: {
'js': '../../tmp/opensourcepos_bower.js',
'css': '../../tmp/opensourcepos_bower.css'
'js': '../tmp/opensourcepos_bower.js',
'css': '../tmp/opensourcepos_bower.css'
}
}
},