Adjust the build config to allow building the CI4 branch.

This commit is contained in:
Steve Ireland
2023-02-06 23:28:22 -05:00
committed by jekkos
parent 1dd58e922f
commit 38a1815d31
4 changed files with 21 additions and 21 deletions

2
.gitattributes vendored
View File

@@ -1,3 +1,3 @@
dist/ merge=ours
application/language/**/*.php merge=ours
app/Language/**/*.php merge=ours
text=auto

View File

@@ -5,14 +5,14 @@ module.exports = function(grunt) {
src: [
'public/**',
'vendor/**',
'application/**',
'!/application/tests',
'app/**',
'!/tests',
'!/public/images/menubar/png/',
'!/public/dist/bootswatch/',
'/public/dist/bootswatch/*/*.css',
'!/public/dist/bootswatch-5/',
'/public/dist/bootswatch-5/*/*.css',
'database/**',
'app/Database/**',
'*.txt',
'*.md',
'LICENSE',
@@ -30,7 +30,7 @@ module.exports = function(grunt) {
wiredep: {
task: {
ignorePath: '../../../public/',
src: ['application/views/partial/header.php']
src: ['app/Views/partial/header.php']
}
},
bower_concat: {
@@ -149,8 +149,8 @@ module.exports = function(grunt) {
banner: '-- >> This file is autogenerated from tables.sql and constraints.sql. Do not modify directly << --'
},
files: {
'database/database.sql': ['database/tables.sql', 'database/constraints.sql'],
'database/migrate_phppos_dist.sql': ['database/tables.sql', 'database/phppos_migrate.sql', 'database/constraints.sql']
'app/Database/database.sql': ['app/Database/tables.sql', 'app/Database/constraints.sql'],
'app/Database/migrate_phppos_dist.sql': ['app/Database/tables.sql', 'app/Database/phppos_migrate.sql', 'database/constraints.sql']
}
}
},
@@ -185,7 +185,7 @@ module.exports = function(grunt) {
ignorePath: '../../../public/'
},
src: ['public/css/*.css', '!public/css/login.css', '!public/css/login.min.css', '!public/css/invoice_email.css', '!public/css/barcode_font.css', '!public/css/darkly.css'],
dest: 'application/views/partial/header.php',
dest: 'app/Views/partial/header.php',
},
mincss_header: {
options: {
@@ -196,7 +196,7 @@ module.exports = function(grunt) {
},
// jquery-ui must be first or at least before opensourcepos.min.css
src: ['public/dist/jquery-ui/*.css', 'public/dist/*.css'],
dest: 'application/views/partial/header.php',
dest: 'app/Views/partial/header.php',
},
css_login: {
options: {
@@ -206,7 +206,7 @@ module.exports = function(grunt) {
ignorePath: '../../public/'
},
src: 'public/css/login.min.css',
dest: 'application/views/login.php'
dest: 'app/Views/login.php'
},
js: {
options: {
@@ -216,7 +216,7 @@ module.exports = function(grunt) {
ignorePath: '../../../public/'
},
src: ['public/dist/bootstrap/js/*.min.js', 'public/js/jquery*', 'public/js/*.js'],
dest: 'application/views/partial/header.php'
dest: 'app/Views/partial/header.php'
},
minjs: {
options: {
@@ -226,7 +226,7 @@ module.exports = function(grunt) {
ignorePath: '../../../public/'
},
src: ['public/dist/*min.js'],
dest: 'application/views/partial/header.php'
dest: 'app/Views/partial/header.php'
}
},
watch: {
@@ -243,7 +243,7 @@ module.exports = function(grunt) {
replacement: 'md5'
},
files: {
src: ['application/views/partial/header.php', 'application/views/login.php']
src: ['app/Views/partial/header.php', 'app/Views/login.php']
}
}
},

View File

@@ -14,14 +14,14 @@ First of all, if you're seeing the message `system folder missing` after launchi
2. Create/locate a new MySQL database to install Open Source Point of Sale into.
3. Execute the file `database/database.sql` to create the tables needed.
4. Unzip and upload Open Source Point of Sale files to the web-server.
5. Open `application/config/database.php` and modify credentials to connect to your database if needed.
6. Open `application/config/config.php` and swap the encryption key with your own.
5. Open `app/Config/database.php` and modify credentials to connect to your database if needed.
6. Open `app/Config/config.php` and swap the encryption key with your own.
7. Go to your install `public` dir via the browser.
8. Log in using
- Username: admin
- Password: pointofsale
9. Enjoy!
10. Oops, an issue? Please make sure you read the FAQ, wiki page, and you checked open and closed issues on GitHub. PHP `display_errors` is disabled by default. Create an` application/config/.env` file from the `.env.example` to enable it in a development environment.
10. Oops, an issue? Please make sure you read the FAQ, wiki page, and you checked open and closed issues on GitHub. PHP `display_errors` is disabled by default. Create an` app/Config/.env` file from the `.env.example` to enable it in a development environment.
## Local install using Docker

View File

@@ -52,10 +52,10 @@
.Server Port: <?php echo esc($_SERVER['SERVER_PORT']) ?><br>
.OS: <?php echo php_uname('s') .' '. php_uname('r') ?><br><br>
File Permissions:<br>
&#187; [application/logs:]
<?php $logs = '../application/logs/';
$uploads = '../public/uploads/';
$images = '../public/uploads/item_pics/';
&#187; [writeable/logs:]
<?php $logs = '../writeable/logs/';
$uploads = '../writeable/uploads/';
$images = '../writeable/uploads/item_pics/';
$import = '../import_items.csv';
$importcustomers = '../import_customers.csv'; //TODO: This variable does not follow naming conventions for the project.
@@ -162,7 +162,7 @@
if(substr(decoct(fileperms($logs)), -4) != 750)
{
echo '<br><span style="color: red;"> &#187; [application/logs:] ' . lang('Config.is_writable') . '</span>';
echo '<br><span style="color: red;"> &#187; [writeable/logs:] ' . lang('Config.is_writable') . '</span>';
}
if(substr(decoct(fileperms($uploads)), -4) != 750)