mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-10 09:59:08 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,369 Commits 75 Branches 39 Tags
bef33fa3c96e33befa214a58711569ec5d9adc19
Commit Graph

67 Commits

Author SHA1 Message Date
Steve Ireland
e7218b2904 For #3741. Manual migration of commits from master to branch through April 22, 2023. 2023-04-27 21:55:06 -04:00
Steve Ireland
b3678baa63 For #3698. Cleanup Attribute.php 2023-04-27 21:54:20 -04:00
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
2fbc9a4a79 For #3739. More adjustments for removing esc() 2023-04-27 21:54:13 -04:00
Steve Ireland
6ffca6cfad For #3730. @odeia raised a couple of issues that needed to be fixed. 2023-04-27 21:54:13 -04:00
Steve Ireland
0bfa56f64a For #3730. This fixes the inability to add a TEXT field to an item. 2023-04-27 21:54:13 -04:00
Steve Ireland
47e25013bf For #3730. This corrects errors I encountered doing attribute configuration. 2023-04-27 21:54:13 -04:00
Steve Ireland
fa38042298 For #3730. More minor corrections to issues found during testing. 2023-04-27 21:54:12 -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
cc604c2beb This cleans up a few more things in the area of giftcards. 2023-04-27 21:54:12 -04:00
Steve Ireland
54416ae19a This cleans up a few more things. 2023-04-27 21:54:12 -04:00
Steve Ireland
7da6aefb10 Minor item maintenance changes. Cleaning up so I can restart fresh for the next major batch of changes. 2023-04-27 21:54:12 -04:00
Steve Ireland
c70fcdbe60 Refactored the empty object initialization to make it easier to clone to other model functions. 2023-04-27 21:54:12 -04:00
Steve Ireland
34ee5cc752 More pogress on Item Maintenance. 2023-04-27 21:54:12 -04:00
Steve Ireland
9c94964052 This reworks some things in customer and item maintenance to improve the behavior of the checkbox. 2023-04-27 21:54:12 -04:00
Steve Ireland
1863db9ab4 Bulk Model changes. 2023-04-27 21:54:12 -04:00
Steve Ireland
9ee7b8f6d4 This commit appears to fix customer deletes and updates. 2023-04-27 21:54:12 -04:00
Steve Ireland
a207539f4f Slightly more progress on customer maintenance. 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
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
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
Steve Ireland
c990bb2abb Tack on the void return type onto the Employee:logout method. 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
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
78cfe927b0 Convert encryption to CI4 
- optimized save function
 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
00955b0c94 Model fixes 
- Removed unused imports
- Simplified boolean expression
- Added missing return type
- Fixed incorrect call to lang()
- Fixed missing type declaration
 2023-04-27 21:54:11 -04:00
objecttothis
dd3b7330d3 Added protected fields for CI4 models 
- primary table
- primary key
- useAutoIncrement
- useSoftDeletes
 2023-04-27 21:54:11 -04:00
objecttothis
6126483586 Added allowedFields to models 
- Without this save(), insert() and update() fail
 2023-04-27 21:54:11 -04:00
objecttothis
75944399a8 commented out code causing infinite loop. 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
dcf1bbb3b2 CI4 updates 
- Fixed bug in appconfig->get_value() that never returns a value
- Trying to fix logout
- Turned on session->regenerateDestroy
 2023-04-27 21:54:10 -04:00
objecttothis
d408675370 Fixed sale->update() signature 2023-04-27 21:54:10 -04:00
objecttothis
bc8c3fd2c3 Simplified boolean comparisons 2023-04-27 21:54:10 -04:00
objecttothis
cd96e42a93 Fix SQL 2023-04-27 21:54:10 -04:00
objecttothis
f0acd506bb Match model function signatures to parent 
- update method
 2023-04-27 21:54:10 -04:00
objecttothis
b5c36f9c4d Match model function signatures to parent 
- delete method
- insert method
- update method
 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
1a0e5b916a 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
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
0fad576550 Correct redirect() calls to CI4 format 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
bdbc86060e Upgrade to CI 4.2.10 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