mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-09 17:39:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Typos and correcting variable

Browse Source
This commit is contained in:
objecttothis
2023-02-12 00:49:26 +04:00
committed by Steve Ireland
parent 628c047078
commit e508ab86cd
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -18,7 +18,7 @@ before_install:
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker run --rm -v $(pwd):/app opensourcepos/composer composer install
- version=$(grep application_version application/config/config.php | sed "s/.*=\s'\(.*\)';/\1/g")
- version=$(grep application_version app/Config/App.php | sed "s/.*=\s'\(.*\)';/\1/g")
- echo "$version-$branch-$rev"
- npm version "$version-$branch-$rev" --force || true
- docker run --rm -it -v $(pwd):/app -w /app opensourcepos/node-grunt-bower

2
app/Controllers/Config.php
View File

@@ -72,7 +72,7 @@ class Config extends Secure_Controller
$composer = FALSE;
$license = [];
$license[$i]['title'] = 'Open Source Point Of Sale ' . config('OSPOSConfig')->application_version;
$license[$i]['title'] = 'Open Source Point Of Sale ' . config('App')->application_version;
if(file_exists('license/LICENSE'))
{

8
app/Views/configs/system_info.php
View File

@@ -18,7 +18,7 @@
</div>
<div class="col-sm-8" id="issuetemplate" style="text-align: left;"><br>
<?php echo lang('Config.ospos_info') . ':' ?>
<?php echo esc(config('OSPOS')->settings['application_version']) ?> - <?php echo esc(substr(config('OSPOS')->settings['commit_sha1'], 0, 6)) ?><br>
<?php echo esc(config('App')->application_version) ?> - <?php echo esc(substr(config('OSPOS')->commit_sha1, 0, 6)) ?><br>
Language Code: <?php echo current_language_code() ?><br><br>
<div id="TimeError"></div>
Extensions & Modules:<br>
@@ -52,9 +52,9 @@
.OS: <?php echo php_uname('s') .' '. php_uname('r') ?><br><br>
File Permissions:<br>
&#187; [writeable/logs:]
<?php $logs = '../writeable/logs/';
$uploads = '../writeable/uploads/';
$images = '../writeable/uploads/item_pics/';
<?php $logs = '../writable/logs/';
$uploads = '../writable/uploads/';
$images = '../writable/uploads/item_pics/';
$import = '../import_items.csv';
$importcustomers = '../import_customers.csv'; //TODO: This variable does not follow naming conventions for the project.

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

@@ -5,7 +5,7 @@
<div class="jumbotron push-spaces">
<strong><?= lang('Common.copyrights', ['current_year' => date('Y')]) ?> ·
<a href="https://opensourcepos.org" target="_blank"><?= lang('Common.website') ?></a> ·
<?= esc(config('OSPOS')->settings['application_version']) ?> - <a target="_blank" href="https://github.com/opensourcepos/opensourcepos/commit/<?= esc(config('OSPOS')->commit_sha1) ?>"><?= esc(substr(config('OSPOS')->commit_sha1, 0, 6)); ?></a></strong>.
<?= esc(config('App')->application_version) ?> - <a target="_blank" href="https://github.com/opensourcepos/opensourcepos/commit/<?= esc(config('OSPOS')->commit_sha1) ?>"><?= esc(substr(config('OSPOS')->commit_sha1, 0, 6)); ?></a></strong>.
</div>
</div>
</body>