mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-10 18:09:30 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,014 Commits 77 Branches 39 Tags
0ce73cc249c237f0c8af04e057f94e032ca42103
Commit Graph

67 Commits

Author SHA1 Message Date
Steve Ireland
0ce73cc249 These minor changes were needed to get to the point where the Item form could be displayed. There are still some issues with the actual form 2023-04-27 21:54:12 -04:00
Steve Ireland
c5180ab614 Primary changes return type from ResultSet to int for those requests that only return a record count. Also corrected a few other minor issues. 2023-04-27 21:54:12 -04:00
Steve Ireland
80b893a332 Corrected model search method naming and added defaults for parameters not provided since the addition of type hints seems to disable the use of default values. 2023-04-27 21:54:12 -04:00
Steve Ireland
512baf7731 Never program while your wife is trying to have a serious discussion with you. 2023-04-27 21:54:11 -04:00
Steve Ireland
f03c75d08b More search corrections 2023-04-27 21:54:11 -04:00
Steve Ireland
3ec33b641f Correct some experimental code. 2023-04-27 21:54:11 -04:00
Steve Ireland
7cb4c3eef1 Correct some experimental code. 2023-04-27 21:54:11 -04:00
Steve Ireland
a9e4283b80 I believe this batch of changes resolves numerous CI4 related issues (but not all issues). 2023-04-27 21:54:11 -04:00
Steve Ireland
750b2afa7a A touch of "standards compliance" cleanup. 2023-04-27 21:54:11 -04:00
objecttothis
63b0068a38 Sales MVC 
- Added todo to Stock_location.php
- make library function return nullable
- Added missing model instantiation
- Commented out Sale model instantiation in library because it's causing infinite loop
- Changed function name prepending get and post required by CI4 autorouting
 2023-04-27 21:54:11 -04:00
Steve Ireland
026ac25106 Restore the logout behavior so that when logout is clicked then the user is returned to the login page. 2023-04-27 21:54:11 -04:00
Steve Ireland
706adf44cd This commit addresses the scenario where encryption fails when the value to be encrypted is either FALSE or blank. I'm testing for !empty before doing encryption/decryption on the value and that seems to be working with this commit. 2023-04-27 21:54:11 -04:00
objecttothis
715275b41f Added missing stock_location model reference 2023-04-27 21:54:11 -04:00
objecttothis
32192b90c3 CI4 bugfixes 
- Added session variable instantiation where needed.
- Added tabular helper to autoload
- removed tabular helper reference where no longer needed.
- Remove esc() references where it was causing display problems.
- Remove excess whitespace on blank line
- Remove unecessary using reference
- Make parameters for dinner table functions nullable
 2023-04-27 21:54:11 -04:00
objecttothis
8a1e4b2083 Convert encryption to CI4 
- automatic upgrade of encryption key.
- automatic decryption of CI3 data, then re-encryption in CI4 and update of table.
- Fixing save function in app_config model
 2023-04-27 21:54:11 -04:00
objecttothis
7738242386 Encryption 
- Removed unneeded encryption code.
- Configured Encryption settings for CI4
 2023-04-27 21:54:11 -04:00
objecttothis
7d78eec7de Fix CI4/CI3 encryption compatibility 
- Removed the CI3 Encryption library as it's no longer needed.
- Added a field to \App\Config\Encryption.php to allow cipher.
- Removed test code for CI3 encryption and added test code for CI4 decryption of CI3 data.
 2023-04-27 21:54:11 -04:00
objecttothis
03872f02c9 Working on encryption 2023-04-27 21:54:11 -04:00
objecttothis
86b47c37c7 Fix login so that it redirects after migration 
- Before it was going on to the home controller after migration, but the session had already been destroyed.
 2023-04-27 21:54:11 -04:00
objecttothis
f3bd5346ea Added missing initialization of stock_location model 2023-04-27 21:54:11 -04:00
objecttothis
2150e4d2e8 Fix encryption and missing call 2023-04-27 21:54:11 -04:00
objecttothis
2dd8a62e34 Replaces calls to config('OSPOS') 
- In controllers, models, helpers and libraries
- Reduced down to one call per class
- Update the OSPOS config on update to ospos_app_config table
 2023-04-27 21:54:10 -04:00
objecttothis
b149ae66cc Reduce calls to config('OSPOS') for speed. 
- calling config from Secure_Controller.php and passing the data through a global view
- calling config in the Login view once rather than using config('OSPOS')->settings[] everywhere
 2023-04-27 21:54:10 -04:00
objecttothis
e508ab86cd Typos and correcting variable 2023-04-27 21:54:10 -04:00
objecttothis
628c047078 Simplified code 2023-04-27 21:54:10 -04:00
objecttothis
d408675370 Fixed sale->update() signature 2023-04-27 21:54:10 -04:00
objecttothis
271d146e73 Fix incorrect function calls 
- Fixed encrypter references
 2023-04-27 21:54:10 -04:00
objecttothis
6e3af9184b Fix incorrect function calls 
- Corrected URI segment calls to CI4
- Corrected session variable references in views
- Fix logout function name in Home Controller
 2023-04-27 21:54:10 -04:00
objecttothis
5022bfacd4 Added calls to helpers 2023-04-27 21:54:10 -04:00
objecttothis
af14768913 Fixed bug preventing view data being passed 
- It was generated in the Secure_Controller.php and now is visible in the partial header.
 2023-04-27 21:54:10 -04:00
objecttothis
558bef7817 Sessions issues. Not fixed yet. 2023-04-27 21:54:10 -04:00
objecttothis
e1fb285da7 Formatting 
- Convert indents to tabs
- Remove unnecessary else statement
- Correct PHPDoc formatting
 2023-04-27 21:54:10 -04:00
objecttothis
98d19040c7 Fixed bug in CI4 conversion functionality 
The bug was causing one row to be inserted because the function was being called twice
 2023-04-27 21:54:10 -04:00
objecttothis
caf31185b0 migrations table migration to CI4 2023-04-27 21:54:10 -04:00
objecttothis
cdb21d3e4c Migrations fixes 
- Minor formating changes
- Adding migration helper calls where needed
- Adding locale helper calls where needed
- Add use statement to tax_lib for sale_lib
- pass gcaptcha enabled to the login view after checking to see if the key exists so that we don't get code errors before migrations 20170501150000
- Fixed getWhere in Appconfig model
 2023-04-27 21:54:10 -04:00
objecttothis
d6d7b7adc6 Convert migrations table to CI4 format 2023-04-27 21:54:10 -04:00
objecttothis
3442d818eb Fixed Login Validation 
- Ported validation rules to CI4 formatting.
- Added Custom Validation Ruleset.
- Formatting and refactoring
 2023-04-27 21:54:09 -04:00
objecttothis
70f49ace6f Fixed migration version check 
- Login now checks the current db version against the latest migration available and displays the migration update message before login.
 2023-04-27 21:54:09 -04:00
objecttothis
fa1f4af420 Login functionality 
- temporarily removed return type from index while troubleshooting.
- load form helper in view
 2023-04-27 21:54:09 -04:00
objecttothis
80cabb5f71 Convert $this->load->vars() to CI4 
- create placeholder view.
- Change call to $this->load->vars() to instead call the empty view with our view data
 2023-04-27 21:54:09 -04:00
objecttothis
936ccb93bf Bug Fixes 
- Properly reference Cookie and Security settings values.
- Instantiate IncomingRequest Instance in view.
- Added return value of Login::index().
- Added missing return statement to Secure_Controller::is_logged_in()
 2023-04-27 21:54:09 -04:00
objecttothis
d7a3bc2259 Fixed index() naming 
- https://codeigniter.com/user_guide/incoming/controllers.html#let-s-try-it-hello-world
- controller methods executed using improved auto routing needs the HTTP verb.
 2023-04-27 21:54:09 -04:00
objecttothis
0fad576550 Correct redirect() calls to CI4 format 2023-04-27 21:54:09 -04:00
objecttothis
3831503721 Renamed index to getIndex in Controllers 2023-04-27 21:54:09 -04:00
objecttothis
8c7f5c15ca CI4 4.3.1 upgrade 
- add missing files
- overwrite changed files
- merge code changes
- Matched .htaccess file in /public/ to CI4
- Corrected naming of Error language file to Errors
- Refactored references to Error language file
 2023-04-27 21:54:09 -04:00
objecttothis
1df52d1c17 CI4 related fixes 
- Revert inadvertent overwrite of Home.php
- Added TODO
 2023-04-27 21:54:09 -04:00
objecttothis
bdbc86060e Upgrade to CI 4.2.10 2023-04-27 21:53:49 -04:00
objecttothis
29c9bd8ccf Bugfixes 
- Added todo
- Added missing files
- Delete CI3 specific files
 2023-04-27 21:53:49 -04:00
objecttothis
f4902002b9 Bugfixes 
- Commenting out non-working portions of migrations
- Fixing company_logo location
 2023-04-27 21:53:49 -04:00
objecttothis
99bd8f7acc Validation for login 2023-04-27 21:53:49 -04:00