From e508ab86cdc0cb55e82867c6085ee951558c97ae Mon Sep 17 00:00:00 2001
From: objecttothis <objecttothis@gmail.com>
Date: Sun, 12 Feb 2023 00:49:26 +0400
Subject: [PATCH] Typos and correcting variable

---
 .travis.yml                       | 2 +-
 app/Controllers/Config.php        | 2 +-
 app/Views/configs/system_info.php | 8 ++++----
 app/Views/partial/footer.php      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0b508fb51..6de962733 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/app/Controllers/Config.php b/app/Controllers/Config.php
index 2d571b0a2..594b92b04 100644
--- a/app/Controllers/Config.php
+++ b/app/Controllers/Config.php
@@ -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'))
 		{
diff --git a/app/Views/configs/system_info.php b/app/Views/configs/system_info.php
index 1bc0d4f17..fd2f3837d 100644
--- a/app/Views/configs/system_info.php
+++ b/app/Views/configs/system_info.php
@@ -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.
 							
diff --git a/app/Views/partial/footer.php b/app/Views/partial/footer.php
index c65bf4758..828216b60 100644
--- a/app/Views/partial/footer.php
+++ b/app/Views/partial/footer.php
@@ -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>