Commit graph

2154 commits

Author SHA1 Message Date
Korina Cordero
cfa77bf2e1 Add source to invoice criteria. Modify invoice rules to get service fees from database. Modify call to invoice to include source. #758 2023-08-23 07:51:43 +00:00
Korina Cordero
8f196000a8 Add permisssions, menu, forms, entity, for ServiceOffering. #758 2023-08-22 08:36:51 +00:00
Korina Cordero
acf7ce0d4d Update the service fee for jumpstart. #756 2023-08-16 07:51:53 +00:00
Ramon Gutierrez
de5f55ac0e Use friendlier error message for invalid confirmation code #746 2023-08-14 07:22:41 +08:00
Ramon Gutierrez
3137d39a9a Add customer account validation and response spoofing to account deletion resend code method #746 2023-08-14 05:22:26 +08:00
Ramon Gutierrez
b3b81e4e27 Add transparent check if number is valid before storing new deletion request #746 2023-08-14 00:28:27 +08:00
Ramon Gutierrez
18c295f2b1 Fix customer record association when submitting a delete request #746 2023-08-13 17:36:33 +08:00
Ramon Gutierrez
9ad1f0d9b2 Add account deletion api endpoints #746 2023-08-11 07:26:49 +08:00
Ramon Gutierrez
73738b7a18 Fix checking of test app store numbers #746 2023-08-10 12:49:06 +08:00
Ramon Gutierrez
e3af21f741 Add mfg id to exported vehicle list, fix default sorting of vehicle results #746 2023-08-09 06:01:24 +08:00
Ramon Gutierrez
f3992f05fc Update apiv2 app version check to include OS #746 2023-08-02 16:39:30 +08:00
Korina Cordero
458a34c6a8 Fix setting of promo for invoice. #755 2023-07-28 05:58:03 +00:00
Ramon Gutierrez
570d405347 Update temp static battery images with new ones, handle spaces in image path #746 2023-07-24 15:36:49 +08:00
Korina Cordero
7b16738709 Fix typo. #753 2023-07-21 06:28:40 +00:00
Korina Cordero
da419dd257 Fix setting of invoice criteria for vat computations and battery entries. #753 2023-07-21 06:25:48 +00:00
Korina Cordero
fc33668a46 Typecast the invoice fields to float. Fix the namespace for APIResponse for TAPI controllers. #752 2023-07-20 02:19:13 +00:00
Ramon Gutierrez
0eef2449e8 Fix duplicate fcm notification issue #746 2023-07-19 16:14:49 +08:00
Korina Cordero
4f70fc437c Fix the same issue in resq 2 app. #750 2023-07-19 07:41:48 +00:00
Korina Cordero
8427b3fb3d Fix adding of battery to invoice criteria for new JOs created from app. #750 2023-07-19 07:17:03 +00:00
Korina Cordero
976acc26ad Change APIResponse namespace for CAPI controllers. #749 2023-07-18 06:16:41 +00:00
Ramon Gutierrez
11355f3eb2 Fix case issue on class name for api controller #746 2023-07-18 09:35:48 +08:00
Korina Cordero
97917cf49b Updated fuel prices. #748 2023-07-12 07:49:30 +00:00
Korina Cordero
12ebe3538c Set taxable for the invoice criteria. #744 2023-07-07 09:36:22 +00:00
Korina Cordero
37ce74f07d Merge branch '746-resq-2-0-final' of gitlab.com:jankstudio/resq into 744-new-invoice-service 2023-07-06 05:39:07 -04:00
Korina Cordero
17e0fd6dcf Merge branch 'master' of gitlab.com:jankstudio/resq into 744-new-invoice-service 2023-07-06 05:25:22 -04:00
Korina Cordero
54c49eb8c5 Add comment on return value for compute. #744 2023-07-05 01:38:31 -04:00
Korina Cordero
2f3a77e96d Fix issues found during testing. #744 2023-07-05 01:36:44 -04:00
Korina Cordero
b4bcc06e42 Modify the invoice manager to be more generic. #744 2023-07-04 06:05:34 -04:00
Ramon Gutierrez
7beeef104c Update table names of role and user to match master #746 2023-06-23 13:14:41 +08:00
Ramon Gutierrez
87f77c9b9c Merge branch '730-resq-2-0' into 746-resq-2-0-final 2023-06-22 12:35:28 +08:00
Ramon Gutierrez
abc4e31d96 Initial commit for insurance listener only #730 2023-06-22 12:34:31 +08:00
Korina Cordero
783c26facc Add setting of taxable for invoice criteria. #744 2023-06-19 00:14:34 -04:00
Korina Cordero
822bc59c6c Set taxable for invoice criteria when app requests a job order. #744 2023-06-18 23:40:09 -04:00
Korina Cordero
9840ecf633 Use interface for the invoice manager. #744 2023-06-18 23:23:29 -04:00
Korina Cordero
f9800d8da3 Make required the initial concern and notes on initial concern fields. #745 2023-06-16 02:09:35 -04:00
Ramon Gutierrez
b81b10840b Pass jo status with each notification #730 2023-06-14 17:36:31 +08:00
Ramon Gutierrez
c2418b117e Attach jo_id to all fcm notifications #730 2023-06-14 17:14:59 +08:00
Ramon Gutierrez
31c0f4a102 Fix customer user not being properly associated with session #730 2023-06-14 16:49:04 +08:00
Ramon Gutierrez
c4878a9e6d Increase os_version size to 200 #730 2023-06-14 16:38:30 +08:00
Ramon Gutierrez
4990a3dc9d Add inital support for FCM push notifications 2023-06-13 20:33:58 +08:00
Korina Cordero
282760fe5a Remove debug message. #744 2023-06-07 05:33:59 -04:00
Korina Cordero
05073f3a0c Add frontend elements for testing JO saving. #744 2023-06-07 05:30:37 -04:00
Korina Cordero
fa514ef26c Remove debug messages. Add TODO task for front-end. #744 2023-06-05 21:51:19 -04:00
Korina Cordero
e9f18ed184 Modify the admin panel to use the new invoice engine when creating a new JO. #744 2023-06-05 21:34:15 -04:00
Korina Cordero
4ebbd8cfd3 Finish adding the test cases. #744 2023-06-05 20:13:37 -04:00
Korina Cordero
fe5121cf71 Add methods to process generateInvoice ajax call. Add test cases. #744 2023-06-05 01:55:04 -04:00
Korina Cordero
a986d7835b Add function to let the JO service call the new invoice manager. #744 2023-06-02 05:50:39 -04:00
Korina Cordero
77c2763f53 Fix typo. #744 2023-06-01 04:39:38 -04:00
Korina Cordero
f760b2c02a Add discount type rule and test cases. #744 2023-06-01 03:22:24 -04:00
Korina Cordero
725704e951 Add test cases for no tax. Fix issues found when computing the total if no tax. #744 2023-05-31 06:09:54 -04:00
Korina Cordero
49317188c9 Fix issues found during testing of tax computation. #744 2023-05-31 03:57:30 -04:00
Korina Cordero
f598e4f426 Add tax rule. #744 2023-05-30 05:54:16 -04:00
Korina Cordero
9bac6df2df Add rules for trade in and other service types. Add test scenarios. #744 2023-05-29 06:05:59 -04:00
Korina Cordero
e3ec6148df Add command to test invoice manager. #744 2023-05-26 05:54:22 -04:00
Korina Cordero
15830924e2 Add function to process the criteria entries. #744 2023-05-25 06:06:15 -04:00
Korina Cordero
0063f10f93 Add function to check what rules to use. #744 2023-05-24 06:16:44 -04:00
Korina Cordero
0bb32f47b5 Modify invoice engine. #744 2023-05-23 07:52:14 -04:00
Ramon Gutierrez
ed037428b3 Fix missing rider object from jo info #730 2023-05-23 14:41:43 +08:00
Ramon Gutierrez
0b3b5eb0bb Add review info to jo info endpoint #730 2023-05-23 14:32:46 +08:00
Korina Cordero
1c02138f52 Add services for the new invoice generator. #744 2023-05-22 06:06:12 -04:00
Ramon Gutierrez
562e96e32d Add review tag management views #730 2023-05-22 14:42:21 +08:00
Ramon Gutierrez
e235026197 Add review tags api #730 2023-05-22 14:12:33 +08:00
Ramon Gutierrez
a821c42f0d Add rider average rating to jo info #730 2023-05-22 13:18:01 +08:00
Ramon Gutierrez
33e6994aaa Add rider rating average computation #730 2023-05-22 13:00:54 +08:00
Ramon Gutierrez
c2c4be8b7b Fix missing entity dependency for rider reviews #730 2023-05-22 12:48:01 +08:00
Ramon Gutierrez
f2233d6680 Remove unnecessary entitymanager dependency on motolite events controller #730 2023-05-17 01:29:53 +08:00
Ramon Gutierrez
9afa2dfc6c Add CRM support for upcoming motolite events #730 2023-05-17 00:30:13 +08:00
Ramon Gutierrez
059bda9bf6 Add limit clause to motolite events endpoint #730 2023-05-16 13:30:12 +08:00
Ramon Gutierrez
9b7e0e55a7 Add missing getter method to motolite events #730 2023-05-16 12:20:05 +08:00
Ramon Gutierrez
24bd64d6e0 Fix events endpoint not returning any rows #730 2023-05-16 12:15:39 +08:00
Ramon Gutierrez
202b2d740e Fix case types on motolite event type namevalue #730 2023-05-16 12:12:01 +08:00
Ramon Gutierrez
8241dc5630 Fix order clause for upcoming events #730 2023-05-16 12:06:15 +08:00
Ramon Gutierrez
58eafabdcf Add api support for motolite events #730 2023-05-16 06:12:05 +08:00
Ramon Gutierrez
9c36baa3d3 Fix jo id null on outlet_assign #730 2023-05-12 15:32:02 +08:00
Ramon Gutierrez
551a39a236 Append JO ID and debug code to outlet_assign event #730 2023-05-12 15:21:15 +08:00
Ramon Gutierrez
8d7556c732 Remove in_transit mqtt event #730 2023-05-12 15:15:14 +08:00
Ramon Gutierrez
b90fc2f8dd Move in_transit event to pre hub departure #730 2023-05-12 15:10:08 +08:00
Ramon Gutierrez
c32b7d68c7 Add in_transit mqtt event for new app #730 2023-05-12 15:05:21 +08:00
Ramon Gutierrez
ea60fa081c Fix missing param for new mqtt client on assigning hub and rider #730 2023-05-11 19:13:56 +08:00
Ramon Gutierrez
4f06c02bd4 Restore legacy MQTTClient, add new MQTTClientApiv2 class for new customer api #730 2023-05-11 18:34:02 +08:00
Ramon Gutierrez
1d278beb35 Fix label for jumpstart service #730 2023-05-11 16:11:39 +08:00
Ramon Gutierrez
0afc1a04b0 Fix partner reviews not working with new customer session type #730 2023-05-11 16:11:17 +08:00
Ramon Gutierrez
a52267ca76 Initial implementation of insurance connector #730 2023-05-06 03:24:45 +08:00
Ramon Gutierrez
3861a9bf93 Keep legacy mqtt payload the same #730 2023-05-06 01:51:06 +08:00
Ramon Gutierrez
ddde274fdc Additional fix using sess array as object on mqtt connector #730 2023-05-06 01:37:07 +08:00
Ramon Gutierrez
82578fb346 Fix using sess array as object on mqtt connector #730 2023-05-06 01:36:21 +08:00
Ramon Gutierrez
e24174e59e Use different mqtt channel for apiv2 sessions #730 2023-05-06 01:33:16 +08:00
Ramon Gutierrez
5f4e6b1ad9 Fix mapping for customer user to session #730 2023-05-04 18:26:57 +08:00
Ramon Gutierrez
8e53a3bb19 Add debug code for mqtt sending #730 2023-05-04 18:08:50 +08:00
Ramon Gutierrez
219ab513b5 Remove truncation of first two digits on customer creation for new API #730 2023-05-04 18:07:38 +08:00
Ramon Gutierrez
87702f0e4c Revert use of isEmpty on arraycollection on mqtt connector #730 2023-05-04 17:41:19 +08:00
Ramon Gutierrez
df6a4ad292 Fix array merge issue on refactoring mqtt client #730 2023-05-04 17:38:10 +08:00
Ramon Gutierrez
13531171d7 Update MQTT client to send to both legacy and new customer sessions #730 2023-05-03 11:03:25 +08:00
Ramon Gutierrez
1ed25d0a26 Remove debug code from review entity #730 2023-04-28 18:14:54 +08:00
Ramon Gutierrez
1261fc1d20 Add support for new customer sessions on partner reviews #730 2023-04-28 18:08:23 +08:00
Ramon Gutierrez
3bf350ceaf Add icon id to service list #730 2023-04-28 17:47:58 +08:00
Ramon Gutierrez
4182e44607 Add date_schedule to JO info generation #730 2023-04-24 17:02:58 +08:00
Ramon Gutierrez
fed0b655f5 Make landmark field optional for now #730 2023-04-24 15:11:09 +08:00
Ramon Gutierrez
68fe13de46 Add missing dependency for warranty #730 2023-04-12 22:52:27 +08:00
Ramon Gutierrez
403de63251 Add missing dependency for warranty serial, replace request input api_key instances with session_key #730 2023-04-12 06:37:15 +08:00
Ramon Gutierrez
bddddf1970 Fix missing dependency on warranty check #730 2023-04-04 11:49:10 +08:00
Korina Cordero
2535498db9 Add TODO for emergency distance limit. #743 2023-03-31 10:29:22 +00:00
Korina Cordero
f6436cd421 Add limit distance for emergencies when assigning hub from Open page. #743 2023-03-31 10:04:16 +00:00
Ramon Gutierrez
cb11849489 Add support for customer credits, add credit manager #730 2023-03-27 04:40:14 +08:00
Ramon Gutierrez
6d416ee5f1 Fix issues encountered during v2 app creation #730 2023-03-26 00:43:45 +08:00
Korina Cordero
92abe703d3 Add checking for JO service type. #740 2023-03-07 02:30:57 +00:00
e2498beca7 Merge branch '739-add-customer-location-to-jo' into 'master'
Resolve "Add customer location to JO"

Closes #739

See merge request jankstudio/resq!854
2023-02-28 10:14:33 +00:00
Korina Cordero
674a862586 Remove else condition. #738 2023-02-28 08:04:19 +00:00
Korina Cordero
e102766961 Move checking for phone number and rejection reason. #738 2023-02-28 08:02:11 +00:00
Korina Cordero
2aef8e64e7 Add blank option for customer location dropdown. Add checking for blank option. #739 2023-02-23 08:02:37 +00:00
Korina Cordero
4717d7d925 Add customer location dropdown to JO form. #739 2023-02-23 07:13:48 +00:00
Korina Cordero
f57c9f5f4f Add CRUD for customer locations. #739 2023-02-23 03:08:17 +00:00
Ramon Gutierrez
d59ac805f7 Update rider app to use correct api response class #730 2023-02-18 23:28:04 +08:00
Ramon Gutierrez
95b5c59db2 Fix customer user not being associated with customer record #730 2023-02-18 15:43:20 +08:00
Ramon Gutierrez
202b984aa2 Fix typo on customer user getter #730 2023-02-18 15:43:02 +08:00
Ramon Gutierrez
f7f182e062 Fix old dependency for customer endpoints on rider app api #730 2023-02-16 05:56:24 +08:00
Korina Cordero
5dc4d9f3f8 Add checking if reason is administrative. #738 2023-02-13 02:05:18 +00:00
Ramon Gutierrez
81d4f46930 Fix existing customer user association #730 2023-02-10 15:10:24 +08:00
71ee183813 Merge branch '734-add-columns-to-nearest-hubs-in-dispatch-page' into 'staging'
Add flag_active to query for riders. #734

See merge request jankstudio/resq!851
2023-02-09 03:14:29 +00:00
Korina Cordero
b87855e0a6 Add flag_active to query for riders. #734 2023-02-08 06:28:02 +00:00
2c6b39acb6 Merge branch '736-rejection-notification-to-hub-via-sms' into 'staging'
Add sending of SMS notification to hub when rejected. #736

See merge request jankstudio/resq!850
2023-02-08 03:32:25 +00:00
8cdf33014e Merge branch '734-add-columns-to-nearest-hubs-in-dispatch-page' into 'staging'
Add rider count columns to Nearest Hubs table in Dispatch page. #734

See merge request jankstudio/resq!848
2023-02-08 03:31:46 +00:00
0331fb605a Merge branch '733-add-capability-to-deactivate-a-battery' into 'staging'
"Add capability to deactivate a battery"

See merge request jankstudio/resq!847
2023-02-08 03:31:13 +00:00
Ramon Gutierrez
e3be92b63e Rename register return value from session_id to session_key #730 2023-02-08 07:45:01 +08:00
Ramon Gutierrez
f62ce78ac7 Fix base api user usage, fix customer user registration logic on number confirm #730 2023-02-08 07:42:51 +08:00
1ecd69b959 Fix typo in ApiUser entity #730 2023-02-08 02:45:20 +08:00
af39b6d6ca Add ApiUser to replace the old catalyst api user #730 2023-02-08 02:44:15 +08:00
Ramon Gutierrez
efec5c4b84 Add proper config for api acl #730 2023-02-08 02:24:25 +08:00
Ramon Gutierrez
e0029d8ab5 Remove debug code for register endpoint, add customer api user entity #730 2023-02-07 18:17:35 +08:00
Korina Cordero
879c80f7be Add sending of SMS notification to hub when rejected. #736 2023-02-07 07:15:43 +00:00
Ramon Gutierrez
98705f99d4 Remove guard on api routes, move all returns to base accessed methods #730 2023-02-07 09:11:17 +08:00
Ramon Gutierrez
9876165af5 Adjust new customer api method groupings, add routes #730 2023-02-07 08:25:07 +08:00
Ramon Gutierrez
b3301fdbac Add new customer app API logic #730 2023-02-07 07:58:57 +08:00
Korina Cordero
ab2d6be08e Add getActiveBatteries function. #733 2023-02-06 10:42:01 +00:00
Korina Cordero
765b3a99b9 Add getActiveBatteries function. #733 2023-02-06 10:39:30 +00:00
Korina Cordero
0e7a955a91 Improve checking for rider status. #735 2023-02-06 10:01:36 +00:00
Korina Cordero
63b02a7c21 Add rider status to rider assignment table. #735 2023-02-06 07:35:06 +00:00
Ramon Gutierrez
2a0ca3b9ea Update auth table names to new standard, fix model association config for acl #730 2023-02-06 05:14:08 +08:00
Korina Cordero
4c4a8da7e6 Add rider count columns to Nearest Hubs table in Dispatch page. #734 2023-02-03 08:36:43 +00:00
Ramon Gutierrez
876722ebe7 Switch over to newer catalyst libs, update service configs #730 2023-02-03 14:52:44 +08:00
Korina Cordero
6e9e56b1be Add filtering for inactive batteries. #733 2023-02-02 09:09:44 +00:00
Korina Cordero
72fc6ee9b0 Fix error. #733 2023-02-02 06:57:07 +00:00
Korina Cordero
cbf5d12d96 Modify queries to only get active batteries. #733 2023-02-02 03:59:21 +00:00
Korina Cordero
c478a4d0bf Add flag_active to Battery entity. Add flag_active to forms. #733 2023-02-02 02:50:22 +00:00
Korina Cordero
fd2a1b35bc Update fuel prices. #729 2023-01-27 06:02:25 +00:00
Korina Cordero
7cd8dcf725 Add sales invoice number field to warranty creation in admin panel. #726 2022-12-26 02:15:43 +00:00
08ecd2ebea Merge branch '725-add-fields-for-warranty-creation-from-admin-panel' into 'master'
Resolve "Add fields for warranty creation from admin panel"

Closes #725

See merge request jankstudio/resq!840
2022-12-20 08:12:53 +00:00
Korina Cordero
7c95f1ff0d Add new fields to warranty creation in admin panel. #725 2022-12-19 06:37:21 +00:00
Korina Cordero
79caebf1f9 Modify fuel prices. #724 2022-12-19 03:28:30 +00:00
Korina Cordero
6d6c855feb Fixed setting of time for date time for query. #723 2022-12-16 08:02:47 +00:00
Korina Cordero
bec964ffa4 Add criteria to warranty raffle filter. #720 2022-11-22 07:39:45 +00:00
Korina Cordero
907bee0d70 Add service to filter warranty raffle entries. #720 2022-11-21 07:37:27 +00:00
Korina Cordero
5b6b090257 Add mobile number from mobile session to warranty raffle report. #719 2022-11-21 07:01:55 +00:00
Korina Cordero
c70dbd3b52 Add action to report. Modify transaction id in report. #718 2022-11-16 10:41:35 +00:00
Korina Cordero
8d9c02ae72 Merge branch '716-jo-raffle-report' of gitlab.com:jankstudio/resq into 717-log-warranty-activities-from-app
Conflicts:
	config/acl.yaml
	config/routes/report.yaml
	src/Controller/ReportController.php
2022-11-14 11:58:25 +00:00
Korina Cordero
29468c629b Add warranty raffle report. #717 2022-11-14 08:11:49 +00:00
Korina Cordero
f2a661f696 Add logging for raffle when doing a serial check, creating and updating a warranty. #717 2022-11-14 06:32:24 +00:00
Korina Cordero
b1d7777726 Add log for warranty from app. #717 2022-11-11 08:33:35 +00:00
Korina Cordero
2317bfee4d Fix formatting of csv output. #716 2022-11-11 03:28:23 +00:00
Korina Cordero
b9159b7f4a Add Raffle Number column. #716 2022-11-11 01:12:21 +00:00
Korina Cordero
1b3d8d86a0 Add JO raffle report. #716 2022-11-10 09:29:01 +00:00
36ad7a28c2 Merge branch '708-warranty-serial-upload-improvements' into 'master'
Resolve "Warranty Serial Upload Improvements"

Closes #708

See merge request jankstudio/resq!824
2022-11-10 06:45:46 +00:00
Korina Cordero
0ece8b5864 Change time of warranty sms notification from one month to 45 days. #715 2022-10-25 02:55:38 +00:00
Korina Cordero
ab77cb6260 Update fuel prices. #714 2022-10-19 01:11:09 +00:00
Korina Cordero
9112bf55f1 Fix formatting for floats. #713 2022-10-11 07:06:58 +00:00
Korina Cordero
36cf10871e Comment debug logs. #713 2022-10-11 05:37:24 +00:00
Korina Cordero
474298a42b Add a break when service type is set to jumpstart_warranty. #713 2022-10-11 05:23:23 +00:00
Korina Cordero
49df3fc976 Change fuel prices. #712 2022-10-11 03:55:26 +00:00
Korina Cordero
1c3032b9e7 Change fuel prices. #711 2022-10-07 07:11:32 +00:00
Korina Cordero
a3be1434a0 Disable removal of QR prefix. #710 2022-09-30 07:51:25 +00:00
Korina Cordero
b3678168da Comment debug logs. #708 2022-09-30 04:57:54 +00:00
Korina Cordero
b4a6e233f1 Delete csv file and directory after processing file. #708 2022-09-29 07:04:53 +00:00
Korina Cordero
6794db5f6a Add checking if any file was processed. #708 2022-09-29 05:50:46 +00:00
Korina Cordero
97d058c3d3 Modify the load warranty serial command to process one file. Add a command to get the number of pending files. Add bash script to call the load warranty serial command. #708 2022-09-28 09:43:04 +00:00
Korina Cordero
815c25a894 Add locking and unlocking for warranty serial queue table when deleting an entry. #708 2022-09-28 06:19:41 +00:00
Korina Cordero
21231358d6 Delete entry from warranty_serial_queue when done processing. #708 2022-09-28 02:43:27 +00:00
Korina Cordero
b8c0fa9932 Add checking for serial length. #707 2022-09-26 06:46:45 +00:00
Korina Cordero
c077094044 Merge branch 'master' of gitlab.com:jankstudio/resq into 704-capi-call-for-warranty-serial 2022-09-22 01:25:16 +00:00
Korina Cordero
6ee6a7d9a1 Comment debug logs. #704 2022-09-21 05:36:39 +00:00
Korina Cordero
9efe73e8b2 Add validation for invalid number of fields. #704 2022-09-21 04:54:21 +00:00
Korina Cordero
f40155e1f5 Change the logging of serial. #704 2022-09-20 08:19:43 +00:00
Korina Cordero
2bbb83c43e Adjust fuel prices. #705 2022-09-20 06:12:34 +00:00
Korina Cordero
6314b4097d Add test capi endpoint. #704 2022-09-20 04:20:36 +00:00
Korina Cordero
138c60a61b Comment out sending to callback URL. #704 2022-09-20 02:38:32 +00:00
Korina Cordero
f8910860a6 Fix json output for command. #704 2022-09-19 09:28:12 +00:00
Korina Cordero
fc15b514bf Add file id. #704 2022-09-19 08:21:29 +00:00
Korina Cordero
0ffbf10879 Fix conflict. #704 2022-09-19 07:15:55 +00:00
Korina Cordero
c42d2973f4 Merge branch 'master' of gitlab.com:jankstudio/resq into 704-capi-call-for-warranty-serial
Conflicts:
	config/api_acl.yaml
	src/Controller/APIUserController.php
2022-09-19 07:14:04 +00:00
Korina Cordero
35d6e34128 Merge branch 'master' of gitlab.com:jankstudio/resq into 686-move-apicontroller-methods-into-capi
Conflicts:
	src/Ramcar/TransactionOrigin.php
2022-09-19 06:35:16 +00:00
Korina Cordero
d9aaea928c Add call to curl to command. #704 2022-09-19 06:27:03 +00:00
Korina Cordero
70e9b933d9 Add output to command. #704 2022-09-16 05:22:14 +00:00
Korina Cordero
cbc0b290ad Add processing for output. #704 2022-09-15 09:51:07 +00:00
Korina Cordero
32720ba9e7 Fix issues for the load command. #704 2022-09-15 07:38:33 +00:00
Korina Cordero
5b848a7f10 Fix issue when creating API user that's not a rider. Fix issues when uploading a file. #704 2022-09-15 05:56:43 +00:00
Korina Cordero
a3e9c45ec3 Separate the uploading of files and the processing of files. #704 2022-09-14 09:33:05 +00:00
Korina Cordero
3c9bdc8152 Add WarrantySerialQueue entity. #704 2022-09-14 08:02:51 +00:00
Korina Cordero
7d65b1eb77 Add CAPI call to upload warranty serial CSV file. #704 2022-09-14 07:33:51 +00:00
Korina Cordero
dae8fe7051 Add credit card amex to mode of payment. #703 2022-08-31 04:57:27 +00:00
Korina Cordero
f51ec9112d Modify fuel prices. #702 2022-08-30 04:38:22 +00:00
4b887adcd2 Merge branch '695-yokohama-add-new-ticket-types-and-subticket-types' into 'master'
Resolve "YOKOHAMA Add new ticket types and subticket types"

Closes #695

See merge request jankstudio/resq!811
2022-08-23 09:34:56 +00:00
5d6eb443a7 Merge branch '694-yokohama-add-new-transactionorigin-types' into 'master'
Resolve "YOKOHAMA Add new TransactionOrigin types"

Closes #694

See merge request jankstudio/resq!810
2022-08-23 09:34:25 +00:00
Korina Cordero
1feef7484e Adjust fuel charges. #700 2022-08-16 07:44:36 +00:00
Korina Cordero
a4338c8f61 Add ownership type dropdown to JO form. #696 2022-08-15 08:28:23 +00:00
Korina Cordero
837a3a2ec5 Add ownership type CRUD. #696 2022-08-15 07:10:15 +00:00
Korina Cordero
c1e33fb5dd Add new ticket and new subticket types. #695 2022-08-12 10:39:08 +00:00
Korina Cordero
5f94f252bc Add new transaction origin types for Yokohama. #694 2022-08-12 08:36:21 +00:00
80d4063238 Change error message for geofence #693 2022-08-05 22:21:49 +08:00
774599a01b Change prices for refuel #693 2022-08-05 22:10:12 +08:00
d27d54f7da Fix motiv being down for getInventory 2022-07-16 19:22:59 +08:00
559d4bbc01 Clean plate number before warranty registering for mobile API 2022-07-13 00:45:58 +08:00
Korina Cordero
270867f86f Redo the warranty creation. #690 2022-06-28 13:21:47 +00:00
Korina Cordero
48aa0b024f Fix warranty creation issue. #690 2022-06-28 12:47:42 +00:00
Korina Cordero
3910db88f0 Fix parameter issue for getJobOrderInfo. #686 2022-06-23 09:39:25 +00:00
Korina Cordero
ee44dfb44e Fix cleaning of mobile number. #686 2022-06-23 09:02:56 +00:00
Korina Cordero
06a2a887ef Fix cleaning of mobile number. #686 2022-06-23 08:46:50 +00:00
Korina Cordero
470dd47195 Add DeliveryStatus to JobOrderController. #686 2022-06-23 08:23:34 +00:00
Korina Cordero
accd6fd0f6 Add validation for model year. #686 2022-06-23 07:57:24 +00:00
b4def3c1a7 Add check to see if motiv reply is valid #688 2022-06-21 21:51:31 +08:00
Korina Cordero
bbb562d366 Comment out scheduleOptionStatus. #686 2022-06-21 10:16:48 +00:00
Korina Cordero
fd77f1ef62 Add route for getNearestHubAndSlots. Modify getNearestHubAndSlots. #686 2022-06-21 10:08:58 +00:00
Korina Cordero
2112edd4f0 Remove getJOHistory. Add route for locationSupport. Modify responses of locationSupport. #686 2022-06-21 09:43:19 +00:00
Korina Cordero
144afae551 Add route for getJobOrderInfo. Modify the responses for getJobOrderInfo. #686 2022-06-21 09:10:23 +00:00
Korina Cordero
4e613e3c01 Add route for cancelJobOrder. Modify cancelJobOrder responses. #686 2022-06-21 08:54:09 +00:00
Korina Cordero
3e73bc0513 Add route for getJOInvoice. Modify getJOInvoice responses. #686 2022-06-21 08:32:19 +00:00
Korina Cordero
f486a1b5a0 Add route for getEstimate. Modify getEstimate for third party api. #686 2022-06-21 07:55:25 +00:00
Korina Cordero
7985ec8f34 Rename validateRequest to validateJORequest. Modify required parameters for getEstimate. #686 2022-06-21 03:57:16 +00:00
Korina Cordero
ce6b1f8049 Fix responses. Add routes for promo. #686 2022-06-21 03:20:30 +00:00
Korina Cordero
5b32349437 Fix the responses for the api calls for vehicle and battery. #686 2022-06-20 10:20:42 +00:00
Korina Cordero
fb91d462ff Add path to tapi calls. Add more required parameters for new job order. #686 2022-06-20 09:00:56 +00:00
Korina Cordero
fb766eb99f Change diesel fuel fee. #687 2022-06-20 06:56:48 +00:00
Korina Cordero
08050416bb Add route for job order creation using third party API. #686 2022-06-20 06:50:06 +00:00
Korina Cordero
c8a8bc53af Start processing of request data. #686 2022-06-17 08:47:55 +00:00
Korina Cordero
44b9679a2e Move third party api controllers to a more descriptive directory. #686 2022-06-16 04:26:27 +00:00
Korina Cordero
60f401e26e Add permissions for another third party api. Copied the methods from APIController into CAPI third party conrtrollers. #686 2022-06-15 08:22:36 +00:00
54f065d30f Merge branch '668-remove-error_logs' into 'master'
Resolve "Remove error_logs"

Closes #668

See merge request jankstudio/resq!783
2022-06-13 02:09:24 +00:00
0734f315ac Merge branch '682-add-code-to-emergency-types' into 'master'
Resolve "Add code to emergency types"

Closes #682

See merge request jankstudio/resq!796
2022-06-12 05:40:06 +00:00
b68d722013 Merge branch '683-use-gettickettypetext-when-returning-ticket-type-for-ticket-list' into 'master'
Resolve "Use getTicketTypeText when returning ticket type for ticket list"

Closes #683

See merge request jankstudio/resq!797
2022-06-12 05:40:00 +00:00
Korina Cordero
a9a5760444 Use getTicketTypeText to display ticket type. #683 2022-06-10 08:39:41 +00:00
Korina Cordero
200f4bca22 Add code to emergency type. #682 2022-06-10 08:32:46 +00:00
Korina Cordero
f8e3e7df2d Add rush request JOs to be marked the same color as emergency. #681 2022-06-10 08:00:18 +00:00
4eb35364ca Merge branch '680-add-code-to-ticket-and-subticket-types' into 'master'
Resolve "Add code to ticket and subticket types"

Closes #680

See merge request jankstudio/resq!794
2022-06-10 07:38:32 +00:00
f90badd331 Merge branch '679-separate-screen-for-resq-transations' into 'master'
Resolve "Separate screen for RESQ transations"

Closes #679

See merge request jankstudio/resq!793
2022-06-10 07:25:49 +00:00
9150db3c20 Merge branch '677-dropdown-menu-for-specific-emergency-scenarios' into 'master'
Resolve "Dropdown Menu for specific Emergency Scenarios"

Closes #677

See merge request jankstudio/resq!791
2022-06-10 07:23:40 +00:00
Korina Cordero
cf97c74ea6 Fix display of ticket types when listing tickets in ticket list, ticket list in job order and ticket list in customer. #680 2022-06-10 07:20:24 +00:00
Korina Cordero
c63b9ffe43 Add code to ticket and subticket types. #680 2022-06-10 06:46:14 +00:00
Korina Cordero
3af014c7cf Remove JOs from mobile app in the Dispatch page. #679 2022-06-08 03:43:44 +00:00
Korina Cordero
d2591a3ffb Fix the routes for JOs coming from the Resq Dispatch page. #679 2022-06-08 03:07:12 +00:00
Korina Cordero
feade62c18 Add query parameter for the return urls when unlocking and editing/dispatching a JO. #679 2022-06-07 10:07:20 +00:00
Korina Cordero
86ab8edb74 Add a separate menu item for dispatch for JOs from mobile app. #679 2022-06-07 07:28:27 +00:00
Korina Cordero
61c7774da0 Fix color coding issue. #678 2022-06-07 03:08:02 +00:00