Steve Ireland
|
bef33fa3c9
|
Resolved various issues with item kit maintenance, one of which was reported on #3754
|
2023-06-10 18:45:14 -04:00 |
|
Steve Ireland
|
43781c8231
|
Add fabrication of database.sql to gulp build.
|
2023-06-05 20:28:45 -04:00 |
|
Steve Ireland
|
97dfdf2f78
|
setAttribute should be setTextAttribute for a group separator symbol.
|
2023-06-04 08:47:12 -04:00 |
|
Steve Ireland
|
9ee0bb1ed4
|
In Token_lib change App\Models\tokens\Token to App\Models\Tokens\Toke
|
2023-05-30 20:58:55 -04:00 |
|
Steve Ireland
|
c143c353b3
|
Fix favicon path in header.php
|
2023-05-30 08:51:30 -04:00 |
|
Steve Ireland
|
1cdefef7fd
|
With this commit we are moving from bower and grunt to gulp in order to build the project.
|
2023-05-29 12:10:27 -04:00 |
|
Steve Ireland
|
6b8e267c95
|
Save Gulp in preparation for migrating these changes over to the ci4 branch
|
2023-05-27 19:17:00 -04:00 |
|
jekkos
|
f6a5b0b01c
|
Revert compose file to v2 (#3754)
|
2023-05-07 15:05:59 +02:00 |
|
jekkos
|
01c129eb0c
|
Bump docker base image to php8
|
2023-05-02 00:23:53 +02:00 |
|
Steve Ireland
|
93536001d2
|
For #3749, added the exit() statement after the header was updated.
|
2023-05-01 08:46:25 -04:00 |
|
Steve Ireland
|
836ffaf0dd
|
Fixes #3749. This seems to resolve issues with employee maintenance. After this commit I was able to add/change employees.
|
2023-04-28 08:52:09 -04:00 |
|
Steve Ireland
|
65c85ab111
|
Merge remote-tracking branch 'origin/ci4-upgrade' into ci4-upgrade
# Conflicts:
# app/Config/App.php
# app/Language/ar-EG/Bootstrap_tables.php
# app/Language/ar-EG/Common.php
# app/Language/ar-EG/Config.php
# app/Language/ar-EG/Customers.php
# app/Language/ar-EG/Employees.php
# app/Language/ar-EG/Expenses.php
# app/Language/ar-EG/Expenses_categories.php
# app/Language/ar-EG/Giftcards.php
# app/Language/ar-EG/Item_kits.php
# app/Language/ar-EG/Items.php
# app/Language/ar-EG/Login.php
# app/Language/ar-EG/Module.php
# app/Language/ar-EG/Receivings.php
# app/Language/ar-EG/Reports.php
# app/Language/ar-EG/Sales.php
# app/Language/ar-EG/Taxes.php
# app/Language/ar-LB/Bootstrap_tables.php
# app/Language/ar-LB/Common.php
# app/Language/ar-LB/Config.php
# app/Language/ar-LB/Customers.php
# app/Language/ar-LB/Employees.php
# app/Language/ar-LB/Expenses.php
# app/Language/ar-LB/Expenses_categories.php
# app/Language/ar-LB/Giftcards.php
# app/Language/ar-LB/Item_kits.php
# app/Language/ar-LB/Items.php
# app/Language/ar-LB/Login.php
# app/Language/ar-LB/Module.php
# app/Language/ar-LB/Receivings.php
# app/Language/ar-LB/Reports.php
# app/Language/ar-LB/Sales.php
# app/Language/ar-LB/Taxes.php
# app/Language/az-AZ/Config.php
# app/Language/da/Sales.php
# app/Language/en-GB/Cashups.php
# app/Language/en-GB/Common.php
# app/Language/en-GB/Config.php
# app/Language/en-GB/Customers.php
# app/Language/en-GB/Employees.php
# app/Language/en-GB/Expenses.php
# app/Language/en-GB/Expenses_categories.php
# app/Language/en-GB/Giftcards.php
# app/Language/en-GB/Item_kits.php
# app/Language/en-GB/Items.php
# app/Language/en-GB/Login.php
# app/Language/en-GB/Module.php
# app/Language/en-GB/Receivings.php
# app/Language/en-GB/Reports.php
# app/Language/en-GB/Sales.php
# app/Language/en-GB/Suppliers.php
# app/Language/en-GB/Taxes.php
# app/Language/en-US/Config.php
# app/Language/en-US/Customers.php
# app/Language/en-US/Sales.php
# app/Language/en-US/Taxes.php
# app/Language/es/Sales.php
# app/Language/fr/Config.php
# app/Language/fr/Customers.php
# app/Language/fr/Expenses_categories.php
# app/Language/id/Config.php
# app/Language/id/Customers.php
# app/Language/id/Expenses_categories.php
# app/Language/id/Login.php
# app/Language/id/Sales.php
# app/Language/id/Taxes.php
# app/Language/lo/Attributes.php
|
2023-04-27 21:58:27 -04:00 |
|
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
|
3c931a91e7
|
For #3741. Manual migration of commits from master to branch through April 3, 2023.
|
2023-04-27 21:55:06 -04:00 |
|
Steve Ireland
|
3bcddd6b78
|
For #3741. Manual migration of commits from master to branch through April 3, 2023 - through commit 89d7fcc.
|
2023-04-27 21:54:52 -04:00 |
|
Steve Ireland
|
d92225c6f7
|
For #3741. Manual migration of commits from master to branch through March 29, 2023.
|
2023-04-27 21:54:43 -04:00 |
|
Steve Ireland
|
1ab8c95412
|
For #3741. Manual migration of commits from master to branch through March 29, 2023, commit dac42b1.
|
2023-04-27 21:54:34 -04:00 |
|
Steve Ireland
|
f7b9c3bc1b
|
For #3741. Manual migration of commits from master to branch through March 19, 2023 commits.
|
2023-04-27 21:54:27 -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 |
|
Aril Apria Susanto
|
95ba062aa5
|
Trying my hand at cherry picking master changes into CI4.
|
2023-04-27 21:54:20 -04:00 |
|
Steve Ireland
|
1f52958380
|
For #3739. More adjustments for removing esc()
|
2023-04-27 21:54:13 -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
|
ae1eebe3c5
|
For #3730. Another save by @odiea.
|
2023-04-27 21:54:13 -04:00 |
|
Steve Ireland
|
294c6a9c32
|
For #3734. This drops the unique index on customer.account_number and replaces it with a non-unique key so that we maintain performance when looking up the account_number.
|
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
|
961419be5d
|
For #3730. Fix issue raised by @odiea and cleaned up the checkboxes on forms so that they render correctly.
|
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
|
35c1ffe0ec
|
Removes a character that magically appeared out of nowhere.
|
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
|
fbd4e37734
|
Restore the tables.sql to its virgin state.
|
2023-04-27 21:54:12 -04:00 |
|
jarebear6expepjozn6rakjq5iczi3irqwphcvbswgkahd6b6twnxxid
|
d879ab6913
|
update int(1) columns in _customers and _cash_up tables to use tinyint (#3709)
|
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
|
9826e545c6
|
Removed problematic calls to site_url function.
|
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 |
|