Commit Graph

35 Commits

Author SHA1 Message Date
Steve Ireland
9b8081191d For #3698. I'm pleased to announce that this set of changes seems to allow a simple order to be completed. 2023-04-27 21:54:20 -04:00
Steve Ireland
71b68a02fd For #3698, this commit gets me to the point where I can add, change and delete items. I'm able to add a payment and delete it, and add a customer to the sale and remove the customer from the sale. There are still issues with the register, but I'm out of time for now. 2023-04-27 21:54:12 -04:00
Steve Ireland
5d9eaa4c2b This got me to the point where I could add an item to a sale. 2023-04-27 21:54:12 -04:00
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
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
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
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
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
e8b7f226fa Added CI3's encryption class as a library
- For now CI4 is straight up not compatible with CI3 encrypted data.
- We will remove this in the future if CI4 fixes the compatibility.
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
29997d9083 Simplified business logic 2023-04-27 21:54:10 -04:00
objecttothis
7b7de41ffc Caching of ospos_app_config
- Implement a caching mechanism for the app_config table
- Revamp the OSPOS custom config so that cached values are used rather than pulling from the db
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
9aec0b45ac Fix incorrect function calls
- Fixed return type in function call to make it nullable.
- Added form helper to autoload since it's used in all the views.
- Fix typo in memory stored OSPOS settings reference.
2023-04-27 21:54:10 -04:00
objecttothis
d83a19a167 Fix decryption 2023-04-27 21:54:10 -04:00
objecttothis
ec14d6d0fd Return int in get_current_version() 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
832e36e379 Removed MY_Validation.php
- Having this in was breaking validation on CI4.  We can figure out how to add it back in later if it's needed.
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
99bd8f7acc Validation for login 2023-04-27 21:53:49 -04:00
objecttothis
52c8511d8d CI4 fixes
- validation
- migration fixes
- string interpolation
- oh my
2023-04-27 21:53:49 -04:00
objecttothis
e4d0497633 Validation 2023-04-27 21:53:49 -04:00
objecttothis
f343c6988e Load OSPOS app settings to variable
- refactor class and variable
- Refactor references to OSPOS configuration
- Replaced " with ' in PHP where parser was not needed
2023-04-27 21:53:49 -04:00
objecttothis
3761c75711 Load OSPOS app settings to variable
- refactor class and variable
- Refactor references to OSPOS configuration
- Replaced " with ' in PHP where parser was not needed
2023-04-27 21:53:49 -04:00
objecttothis
0e92645370 CI4 runtime fixes
- Added todo
- refactored function to CI4 formatting
2023-04-27 21:53:48 -04:00
objecttothis
53b81f804e CI4 changes
- Corrected capitalization of App in use statements
- Added use statements where missing in Events.php
2023-04-27 21:53:48 -04:00
jekkos
ace7c2b131 Apply changes from master 2023-04-27 21:53:02 -04:00
jekkos
5a0d5ae6bb Apply changes from master 2023-04-27 21:52:54 -04:00
objecttothis
63162b97fe Upgrade to CodeIgniter 4.1.3 2023-04-27 21:52:54 -04:00
jekkos
09201ab344 Prepare rebase: move files to new folder structure 2023-04-27 21:52:28 -04:00