rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Resolve "Data archiving" #1687

Open
korina.cordero wants to merge 139 commits from 762-data-archiving into 746-resq-2-0-final
pull from: 762-data-archiving
merge into: rgutierrez:746-resq-2-0-final
Conversation 30 Commits 139 Files changed 69 +4957 -137

139 commits

Author SHA1 Message Date
Korina Cordero
ac361866bb Modify array size for job order. #762 2024-03-27 01:07:11 -04:00
Korina Cordero
7f10d3776e Merge branch '762-data-archiving' of gitlab.com:jankstudio/resq into 762-data-archiving 2024-03-26 04:04:35 -04:00
Korina Cordero
1d743abd87 Fix saving of the enye character. #762 2024-03-26 04:03:04 -04:00
Korina Cordero
03709b0d34 Add fix for missing entries when loading file to database. #762 2024-03-26 04:03:04 -04:00
Korina Cordero
dc363e46cc Added batch update for rider table. #762 2024-03-26 04:03:04 -04:00
Korina Cordero
9128768b99 Fix issues found during testing. #762 2024-03-26 04:03:04 -04:00
Korina Cordero
ce39e66127 Modify updating of rider table. #762 2024-03-26 04:03:04 -04:00
Korina Cordero
b66c809b01 Add TODO for updating rider. #762 2024-03-26 04:03:04 -04:00
Korina Cordero
23ab280df3 Add updating of rider's current and active jo ids to null. #762 2024-03-26 04:03:04 -04:00
Korina Cordero
d75b94693b Add updating of rider's active and current job orders. #762 2024-03-26 04:03:04 -04:00
Korina Cordero
8ff3fe8d3c Modify saving of reference job order for job order. #762 2024-03-26 04:03:04 -04:00
Korina Cordero
a437a1f74e Add reference_jo_id field to hold the job order id for reference orders. Add a command to decouple reference job order from job order. #762 2024-03-26 04:02:57 -04:00
Korina Cordero
ca09d6fc2e Fix deletion issues for related tables. #762 2024-03-26 03:58:24 -04:00
Korina Cordero
22985cde51 Add deletion. #762 2024-03-26 03:58:24 -04:00
Korina Cordero
b2b39b72e1 Add retrieval of ids for deletion. #762 2024-03-26 03:58:24 -04:00
Korina Cordero
b33257711e Set limit to jo query results. #762 2024-03-26 03:58:24 -04:00
Korina Cordero
1f8f403970 Improve performance. #762 2024-03-26 03:58:24 -04:00
Korina Cordero
5834e0a38f Add loading of data files. #762 2024-03-26 03:58:24 -04:00
Korina Cordero
9cfc4132c4 Fix load file issue. #762 2024-03-26 03:58:24 -04:00
Korina Cordero
29441d82c9 Add loading of data file. #762 2024-03-26 03:58:24 -04:00
Korina Cordero
9c465cae69 Add archiving for invoice item. Add creation of other archive tables. #762 2024-03-26 03:58:24 -04:00
Korina Cordero
9eedab0652 Add data files for the related job order tables. #762 2024-03-26 03:58:24 -04:00
Korina Cordero
e56a5eef44 Refactor the retrieval of job order data to include the other associated tables. #762 2024-03-26 03:58:24 -04:00
Korina Cordero
f806130561 Modify code according to code review. #762 2024-03-26 03:58:24 -04:00
Korina Cordero
12edc9915d Fix issues found when saving archive data. #762 2024-03-26 03:58:24 -04:00
Korina Cordero
a74bce2e35 Add saving of data to archive table. #762 2024-03-26 03:58:24 -04:00
Korina Cordero
6ba3ab7186 Add loading of data into database. #762 2024-03-26 03:58:24 -04:00
Korina Cordero
6382cfda1e Add checking for nulls when creating the data for backup. #762 2024-03-26 03:58:24 -04:00
Korina Cordero
7b6838a89a Add command to archive job order data. #762 2024-03-26 03:58:24 -04:00
Ramon Gutierrez
25e0931f6f Revert warranty serial check for now #783 2024-03-23 04:03:00 +08:00
Ramon Gutierrez
5af3a3cb5e Add check for if serial is present before registering warranty #783 2024-03-23 04:01:16 +08:00
Ramon Gutierrez
07b459e7a3 Add pycache and test insurance banner to gitignore #783 2024-03-19 19:16:34 +08:00
Ramon Gutierrez
c4e03f861d Exclude cancelled JOs on rider app API #783 2024-03-19 17:33:13 +08:00
Ramon Gutierrez
cd21e41d2f Merge branch '793-prevent-jo-progression-on-rider-app-after-cancellation' into '783-rider-app-trade-in-support' 
Rename JO progression check method #793

See merge request jankstudio/resq!905
 2024-03-19 08:36:23 +00:00
Ramon Gutierrez
1a6af00399 Rename JO progression check method #793 2024-03-19 16:35:51 +08:00
Ramon Gutierrez
c03025748f Merge branch '793-prevent-jo-progression-on-rider-app-after-cancellation' into '783-rider-app-trade-in-support' 
Resolve "Prevent JO progression on rider app after cancellation"

See merge request jankstudio/resq!904
 2024-03-19 08:33:43 +00:00
Ramon Gutierrez
ca513355fe Switch parameters of allowJOProgress to fix error #793 2024-03-19 15:25:32 +08:00
Ramon Gutierrez
9152370300 Add checks to prevent JO progression if cancelled #793 2024-03-19 15:22:34 +08:00
Ramon Gutierrez
bff89a6817 Add regional pricing support to job order updates on rider app #783 2024-03-15 16:24:09 +08:00
Ramon Gutierrez
a59aa0f66d Make insurance body types a namevalue class #783 2024-03-14 13:40:37 +08:00
Ramon Gutierrez
69218aecf4 Update insurance application paid call to use external transaction id #783 2024-03-13 14:33:29 +08:00
Ramon Gutierrez
47dcd92474 Refactor insurance, paymongo connector logging logic #783 2024-03-13 07:09:56 +08:00
Ramon Gutierrez
9f4c16b149 Add debug code for insurance api #783 2024-03-12 16:34:21 +08:00
Ramon Gutierrez
175ac92765 Fix syntax error on rider api controller #783 2024-03-11 23:50:44 +08:00
Ramon Gutierrez
801a274e8c Disable serial number requirement on rider api to allow old rider app to work for now #783 2024-03-11 23:45:05 +08:00
Ramon Gutierrez
d603934d93 Update the correct MQTT client with latest changes #783 2024-03-07 23:41:21 +08:00
Ramon Gutierrez
a4b883b7ea Fix rider assign MQTT event for new rider app #783 2024-03-07 23:39:57 +08:00
Ramon Gutierrez
a2cd86b48c Merge branch '780-regional-pricing' into 783-rider-app-trade-in-support 
# Conflicts:
#	src/Controller/CAPI/RiderAppController.php
#	src/InvoiceRule/BatterySales.php
 2024-03-07 09:42:42 +08:00
Ramon Gutierrez
ef5e629358 Merge branch '791-support-for-insurance-premiums-banner' into 780-regional-pricing 2024-02-23 18:40:10 +08:00
Ramon Gutierrez
4dd8efd95a Fix returned format of body types endpoint #791 2024-02-23 18:39:21 +08:00
Korina Cordero
34adefb798 Merge branch '791-support-for-insurance-premiums-banner' of gitlab.com:jankstudio/resq into 780-regional-pricing 2024-02-23 04:01:58 -05:00
Ramon Gutierrez
78a43ae85c Add insurance body types endpoint #791 2024-02-23 16:53:04 +08:00
Korina Cordero
7ed9f90945 Merge branch '791-support-for-insurance-premiums-banner' of gitlab.com:jankstudio/resq into 780-regional-pricing 2024-02-22 19:42:15 -05:00
Ramon Gutierrez
0a4f78559c Merge branch '791-support-for-insurance-premiums-banner' into 783-rider-app-trade-in-support 2024-02-22 16:51:55 +08:00
Ramon Gutierrez
270a4cfb10 Add endpoint for insurance premiums banner #791 2024-02-22 16:51:26 +08:00
Ramon Gutierrez
7a5583d840 Include trade in type and container size to battery info rider api call #783 2024-02-22 16:08:36 +08:00
Korina Cordero
4d89e7420f Add checking for location and price tier when getting list of compatible batteries. #780 2024-02-20 02:09:57 -05:00
Korina Cordero
010bdca458 Add updating of other fields when updating job order. Fix issue found during testing in invoice rule. #783 2024-02-12 06:19:00 -05:00
Korina Cordero
abf4bbfe22 Add checking for promo. #783 2024-02-12 03:46:26 -05:00
Ramon Gutierrez
eebd1d93c4 Fix battery info endpoint to work with warranty serials instead #783 2024-02-08 23:17:32 +08:00
Ramon Gutierrez
ba09e6ac7b Merge branch '782-invoice-and-jo-modifications-for-regional-pricing' into '780-regional-pricing' 
Resolve "Invoice and JO modifications for regional pricing"

See merge request jankstudio/resq!894
 2024-02-08 06:21:40 +00:00
Ramon Gutierrez
8860796db2 Add endpoint for rider app trade-in types #783 2024-02-07 15:02:47 +08:00
Ramon Gutierrez
3254527653 Merge branch 'master' into '782-invoice-and-jo-modifications-for-regional-pricing' 
Master

See merge request jankstudio/resq!901
 2024-02-06 08:16:28 +00:00
Korina Cordero
8ca7292a25 Add processing of trade in items from rider app. #783 2024-02-05 03:06:06 -05:00
Korina Cordero
c9057b9617 Add API call to update invoice. #783 2024-02-02 04:50:03 -05:00
Korina Cordero
86744afde3 Add serial as a parameter when rider fulfills a job order. #783 2024-02-01 04:24:09 -05:00
Korina Cordero
ae46d64f5b Add API call to return battery data given a serial. #783 2024-02-01 03:10:16 -05:00
Ramon Gutierrez
a5340fbfd6 Merge branch '788-remove-geofence-message-from-view-jo' into 'master' 
Resolve "Remove geofence message from View JO"

Closes #788

See merge request jankstudio/resq!900
 2024-02-01 06:46:29 +00:00
Korina Cordero
0e5365a015 Comment out geofence message when viewing JO. Initialize branch_codes array. #788 2024-01-31 20:13:41 -05:00
Ramon Gutierrez
313dc74eb0 Merge branch '784-transaction-origin-additional-fields' into 'master' 
Fix transaction origin list to replace existing facebook and hotline with manila entries #784

Closes #784

See merge request jankstudio/resq!899
 2024-01-31 14:06:05 +00:00
Ramon Gutierrez
33eaf9bbff Fix transaction origin list to replace existing facebook and hotline with manila entries #784 2024-01-31 22:05:42 +08:00
Ramon Gutierrez
8ee1809a99 Merge branch '787-update-geofence-message-in-app' into 'master' 
Resolve "Update geofence message in app"

Closes #787

See merge request jankstudio/resq!898
 2024-01-30 07:25:15 +00:00
Korina Cordero
5717eddaa0 Update geofence message in the app. #787 2024-01-30 02:24:08 -05:00
Ramon Gutierrez
35b3b23e55 Merge branch '786-remove-geofence-message-in-crm' into 'master' 
Resolve "Remove geofence message in CRM"

Closes #786

See merge request jankstudio/resq!897
 2024-01-30 07:14:34 +00:00
Korina Cordero
f7c8034538 Comment out the geofence call for admin panel. #786 2024-01-30 02:12:08 -05:00
Ramon Gutierrez
ba8ac73c9d Merge branch '785-no-sms-notification-for-discount' into 'master' 
Resolve "No SMS notification for discount"

Closes #785

See merge request jankstudio/resq!896
 2024-01-30 07:03:47 +00:00
Korina Cordero
9b52d4578f Add checking for discount rejection reason. #785 2024-01-30 02:02:24 -05:00
Ramon Gutierrez
b033e5674d Merge branch '784-transaction-origin-additional-fields' into 'master' 
Resolve "Transaction Origin additional fields"

Closes #784

See merge request jankstudio/resq!895
 2024-01-30 06:33:05 +00:00
Korina Cordero
0e2afaa400 Add new fields for transaction origin. #784 2024-01-30 01:30:09 -05:00
Ramon Gutierrez
b123be25cc Add battery sizes endpoint to rider api #783 2024-01-30 03:42:05 +08:00
Korina Cordero
d4eae00902 Add sql for item types. #782 2024-01-28 22:21:34 -05:00
Korina Cordero
20f5bb08e0 Add checking for longitude and latitude when calling getEstimate. #782 2024-01-26 04:50:54 -05:00
Korina Cordero
213171f4b7 Add price tiering for Resq 2 App and TAPI. #782 2024-01-26 04:44:18 -05:00
Korina Cordero
c136b0666b Fix issues found during testing. #782 2024-01-25 03:08:00 -05:00
Korina Cordero
57fd7fe5ac Fix issues found during testing. #782 2024-01-25 02:23:47 -05:00
Korina Cordero
bc6364ace5 Add price tier to invoice rules. #782 2024-01-25 02:11:05 -05:00
Korina Cordero
c5b395d720 Add price tier for battery replacement warranty. #782 2024-01-24 04:02:14 -05:00
Korina Cordero
b6763bfd3e Add price tier checking for battery sales. #782 2024-01-24 02:24:13 -05:00
Korina Cordero
29ad8d57a4 Add processing of battery entries and invoice item titles. #782 2024-01-22 04:24:41 -05:00
root
70ee7fdd89 Add invoice rule for price tier. #782 2024-01-19 04:14:06 -05:00
Korina Cordero
ee033ddd55 Fix issues found during testing. #780 2024-01-17 15:31:26 +08:00
Korina Cordero
a83fecf224 Merge branch 'master' of gitlab.com:jankstudio/resq into 780-regional-pricing 2024-01-17 14:50:50 +08:00
Korina Cordero
9de6fa7999 Fix issues found during saving of item prices. #780 2024-01-17 14:25:28 +08:00
Korina Cordero
6d7c8c5b53 Add saving of item prices for price tier. #780 2024-01-16 16:28:26 +08:00
Korina Cordero
022336ad8f Add saving of prices. #780 2024-01-15 17:21:31 +08:00
Korina Cordero
bfe7a5fbf6 Fix display of item prices per tier. #780 2024-01-15 15:23:07 +08:00
Korina Cordero
b592390554 Add response when displaying item prices. #780 2024-01-11 16:48:23 +08:00
Korina Cordero
7f4675a8a2 Add item type dropdown to form. #780 2024-01-10 17:23:15 +08:00
Korina Cordero
f65ca19010 Load service offering into Item Pricing page. #780 2024-01-09 17:39:29 +08:00
Korina Cordero
c17be92f0a Fix errors for item query. #780 2023-12-31 00:46:12 -05:00
Korina Cordero
80b9f90324 Rename ItemPriceController to ItemController. #780 2023-12-30 23:09:27 -05:00
Korina Cordero
01e4baa8c4 Add item price controller. #780 2023-12-28 20:41:44 -05:00
Korina Cordero
e4ffcc0c9d Add controller for item pricing. #780 2023-12-27 22:15:44 -05:00
Ramon Gutierrez
9c081b416e Merge branch '781-fix-character-length-for-motolite-events-title' into 'master' 
Increase motolite event name field size to 255 #781

Closes #781

See merge request jankstudio/resq!893
 2023-12-22 07:30:47 +00:00
Ramon Gutierrez
5ee41dab32 Increase motolite event name field size to 255 #781 2023-12-22 15:30:11 +08:00
root
58f46fd5bf Add route and CRUD for item type. #780 2023-12-21 23:23:46 -05:00
Korina Cordero
8c810bf27a Add validation and deletion for price tier. #780 2023-12-21 16:24:37 +08:00
Korina Cordero
fa3cf12be1 Add controller for price tier. #780 2023-12-20 18:15:17 +08:00
Korina Cordero
9447f64312 Create item price, price tier, and item type entities for regional pricing. #780 2023-12-19 17:30:38 +08:00
Ramon Gutierrez
b51160e9d0 Merge branch '779-fix-battery-recommendations-still-including-inactive-batteries' into 'master' 
Display inactive batteries on edit vehicle form, exclude inactive batteries on...

Closes #779

See merge request jankstudio/resq!891
 2023-12-18 09:18:17 +00:00
Ramon Gutierrez
d8bd2803e0 Display inactive batteries on edit vehicle form, exclude inactive batteries on battery recommendations API endpoint #779 2023-12-18 17:17:40 +08:00
Ramon Gutierrez
a7c7b03d06 Merge branch '746-resq-2-0-final' into 'master' 
Add source to invoice criteria. Modify invoice rules to get service fees from...

See merge request jankstudio/resq!890
 2023-11-22 08:54:47 +00:00
Korina Cordero
1a01270723 Fix saving of the enye character. #762 2023-10-04 13:58:53 +08:00
Korina Cordero
4b59380e72 Add fix for missing entries when loading file to database. #762 2023-10-04 10:08:42 +08:00
Korina Cordero
85483fb744 Added batch update for rider table. #762 2023-10-03 22:08:46 +08:00
Korina Cordero
f78e376576 Fix issues found during testing. #762 2023-09-29 20:47:13 +08:00
Korina Cordero
67635b07d5 Modify updating of rider table. #762 2023-09-28 19:35:10 +08:00
Korina Cordero
3e0084630f Add TODO for updating rider. #762 2023-09-28 19:07:11 +08:00
Korina Cordero
9bf5d5851a Add updating of rider's current and active jo ids to null. #762 2023-09-28 18:22:56 +08:00
Korina Cordero
12d9c14a03 Add updating of rider's active and current job orders. #762 2023-09-28 16:00:28 +08:00
Korina Cordero
4fa5ea156f Modify saving of reference job order for job order. #762 2023-09-28 14:41:49 +08:00
Korina Cordero
96bd783ae9 Add reference_jo_id field to hold the job order id for reference orders. Add a command to decouple reference job order from job order. #762 2023-09-28 14:15:41 +08:00
Korina Cordero
d78dc72c35 Fix deletion issues for related tables. #762 2023-09-27 14:54:36 +08:00
Korina Cordero
645e8a63fc Add deletion. #762 2023-09-26 16:28:40 +08:00
Korina Cordero
e65083bc4c Add retrieval of ids for deletion. #762 2023-09-26 13:03:47 +08:00
Korina Cordero
fde9b367ec Set limit to jo query results. #762 2023-09-22 14:37:54 +08:00
Korina Cordero
19840c0305 Improve performance. #762 2023-09-20 15:31:46 +08:00
Korina Cordero
a7c6988607 Add loading of data files. #762 2023-09-20 11:54:05 +08:00
Korina Cordero
f52293caa6 Fix load file issue. #762 2023-09-19 12:48:14 +08:00
Korina Cordero
3773a664d1 Add loading of data file. #762 2023-09-18 18:10:06 +08:00
Korina Cordero
c1578eee1f Add archiving for invoice item. Add creation of other archive tables. #762 2023-09-15 18:19:11 +08:00
Korina Cordero
d7a2b25e51 Add data files for the related job order tables. #762 2023-09-13 17:18:33 +08:00
Korina Cordero
35ed917336 Refactor the retrieval of job order data to include the other associated tables. #762 2023-09-12 18:18:37 +08:00
Korina Cordero
986181c780 Modify code according to code review. #762 2023-09-12 11:35:31 +08:00
Korina Cordero
7e3c392c03 Fix issues found when saving archive data. #762 2023-09-11 15:10:08 +08:00
Korina Cordero
4eca65cc59 Add saving of data to archive table. #762 2023-09-08 17:24:43 +08:00
Korina Cordero
4c0460bdb5 Add loading of data into database. #762 2023-09-08 15:27:19 +08:00
Korina Cordero
c318c471ff Add checking for nulls when creating the data for backup. #762 2023-09-07 18:01:13 +08:00
Korina Cordero
22d4201097 Add command to archive job order data. #762 2023-09-07 16:29:27 +08:00