From 820ddbb621e10ed1a560689c13cd0c381d613abb Mon Sep 17 00:00:00 2001 From: Karl Cordes Date: Sat, 6 Apr 2019 22:16:13 +1100 Subject: [PATCH] Fix issues in new enquiry logic --- app/README.md | 7 +++++++ app/config/core.php | 6 ++++-- app/controllers/app_controller.php | 3 ++- app/controllers/enquiries_controller.php | 11 +++++++++-- app/views/layouts/default.ctp | 3 +-- app/webroot/pdf/CMC_terms_and_conditions2006_A4.pdf | Bin run_docker.sh | 2 +- 7 files changed, 24 insertions(+), 8 deletions(-) mode change 100644 => 100755 app/webroot/pdf/CMC_terms_and_conditions2006_A4.pdf diff --git a/app/README.md b/app/README.md index 8a4d074d..a0d835d7 100755 --- a/app/README.md +++ b/app/README.md @@ -2,3 +2,10 @@ This software powers the Sales process at CMC Technologies. +## Adding users + +Auth is now handled by nginx +https://docs.nginx.com/nginx/admin-guide/security-controls/configuring-http-basic-authentication/#example + +Need to create a user in the DB, and then set the password in the htpasswd file + diff --git a/app/config/core.php b/app/config/core.php index 838e35e9..698f73bf 100644 --- a/app/config/core.php +++ b/app/config/core.php @@ -41,7 +41,7 @@ error_reporting(E_ALL & ~E_STRICT & ~E_DEPRECATED); * In production mode, flash messages redirect after a time interval. * In development mode, you need to click the flash message to continue. */ -Configure::write('debug', 0); +Configure::write('debug', 1); Configure::write('version', '1.0.1'); @@ -60,6 +60,8 @@ Configure::write('smtp_settings', array( $production_hosts = array('cmc.lan', '192.168.0.7', 'cmcbeta.lan', 'office.cmctechnologies.com.au:5000'); + + if (in_array($host, $production_hosts)) { $basedir = '/var/www/CMC-Sales/app'; Configure::write('email_directory', '/var/www/emails'); @@ -72,7 +74,7 @@ if (in_array($host, $production_hosts)) { 'prefix' => Inflector::slug(APP_DIR) . '_', //[optional] prefix every cache file with this string )); } else { //Development config - $basedir = '/home/cmc/cmc-sales/app/'; + $basedir = '/var/www/cmc-sales/app/'; Cache::config('default', array( 'engine' => 'File', //[required] diff --git a/app/controllers/app_controller.php b/app/controllers/app_controller.php index d00607f1..bee0416b 100755 --- a/app/controllers/app_controller.php +++ b/app/controllers/app_controller.php @@ -52,7 +52,8 @@ class AppController extends Controller { * @return array - the currently logged in user. */ function getCurrentUser() { - return $this->Session->read('Auth.User'); + $user = $this->User->find('first', array('recursive' => 0, 'conditions' => array('User.username'=>$_SERVER["PHP_AUTH_USER"]))); + return $user; } /** diff --git a/app/controllers/enquiries_controller.php b/app/controllers/enquiries_controller.php index b6290c4a..ee61f167 100755 --- a/app/controllers/enquiries_controller.php +++ b/app/controllers/enquiries_controller.php @@ -218,6 +218,7 @@ class EnquiriesController extends AppController { /* Find how many enquiries have been for this principle code */ $principleenquiries = $this->Enquiry->findCount('principle_code ='. $principle['Principle']['code']); + /* Principle Code Offsets - Existing Number of Enquiries for each Principle Code */ $principlecode_offset = array( 15 => 207, //ELMAC, AMAL 20 => 51, //T and B Electronic @@ -228,7 +229,10 @@ class EnquiriesController extends AppController { 65 => 2212, //Papenmeier, Herberts Industrieglas 85 => 586, //Analytical Systems, Misc 95 => 181); //Comet, T and D. - $principleenquiries += $principlecode_offset[$principle['Principle']['code']]; //Add the offset. + if(array_key_exists($principle['Principle']['code'], $principlecode_offset)) { + $principleenquiries += $principlecode_offset[$principle['Principle']['code']]; //Add the offset. + } + $principleenquiries++; @@ -283,7 +287,10 @@ class EnquiriesController extends AppController { "ACT" => 0, "QLD" => 29, "NT" => 0, "WA" => 9, "SA" => 8, "Overseas" => 31), ); - $stateprincipleenquiries += $stateprinciple_offset[$principle['Principle']['code']][$state['State']['shortform']]; + if(array_key_exists($principle['Principle']['code'], $stateprinciple_offset)) { + $stateprincipleenquiries += $stateprinciple_offset[$principle['Principle']['code']][$state['State']['shortform']]; + } + $stateprincipleenquiries++; /* Generate/set the enquiry number */ $enquiryno = 'CMC'.$enquiryid.$state['State']['enqform'].'E'.$principle['Principle']['code'].$principleenquiries. diff --git a/app/views/layouts/default.ctp b/app/views/layouts/default.ctp index 20ca5f76..94d0871f 100755 --- a/app/views/layouts/default.ctp +++ b/app/views/layouts/default.ctp @@ -56,8 +56,7 @@ echo $scripts_for_layout;