mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-10 01:51:02 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,063 Commits 75 Branches 39 Tags
e7218b2904de8828fa4e299a786f56916eebeb96
Commit Graph

98 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
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
2847d36f48 For #3732. Fixes for reported item maintenance issues. 2023-04-27 21:54:13 -04:00
Steve Ireland
29fabc0522 For #3739. Removed unnecessary escaping from customer maintenance. 2023-04-27 21:54:13 -04:00
Steve Ireland
3668f3cb86 For #3730. This adds a migration script to preload required configuration values. 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
3154b618e5 For #3730. Prototype of item maintenance changes. 2023-04-27 21:54:13 -04:00
Steve Ireland
47f419368b For #3730. This replaces FILTER_SANITIZE_STRING with FILTER_SANITIZE_FULL_SPECIAL_CHARS. 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
ee21f2a6aa For #3730. Made more changes to get configuration panels working. 2023-04-27 21:54:12 -04:00
Steve Ireland
badc390a98 For #3730. Discovered that saving the mailchimp credentials without actual credentials was creating an absurd encrypted value that was causing a subsequent crash. There may be a future issue to be dealt with here, but this commit will leave the config for mailchimp blank. 2023-04-27 21:54:12 -04:00
Steve Ireland
b5f67ae4b2 For #3730, some progress made on configuration maintenance. More remains to be done. 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
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
30bf97679a Remove a debug statement. 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
ddc976919d It started to seem a little silly and a waste of time to try to keep including "ajax" in function names to identify them as function calls. So I'm backing that out with this commit, and going forward I will be removing ajax from the function names where they were added. 2023-04-27 21:54:12 -04:00
Steve Ireland
8cbc915741 A few tweaks for item maintenance 2023-04-27 21:54:12 -04:00
Steve Ireland
228801157c A few additional tweaks for customer maintenance 2023-04-27 21:54:12 -04:00
Steve Ireland
b707677789 Bulk Controller changes. 2023-04-27 21:54:12 -04:00
Steve Ireland
c564debc63 This commit renames the get_row ajax call to getAjaxRow in order to line up with the changes made to get customer maintenance working. 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
022b2b07a8 Making these changes allowed me to actually add a new customer. It wasn't extensively tested but it's progress. 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
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