Commit graph

2149 commits

Author SHA1 Message Date
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
8ca7292a25 Add processing of trade in items from rider app. #783 2024-02-05 03:06:06 -05:00
c9057b9617 Add API call to update invoice. #783 2024-02-02 04:50:03 -05:00
86744afde3 Add serial as a parameter when rider fulfills a job order. #783 2024-02-01 04:24:09 -05:00
ae46d64f5b Add API call to return battery data given a serial. #783 2024-02-01 03:10:16 -05:00
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
5717eddaa0 Update geofence message in the app. #787 2024-01-30 02:24:08 -05:00
9b52d4578f Add checking for discount rejection reason. #785 2024-01-30 02:02:24 -05:00
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
20f5bb08e0 Add checking for longitude and latitude when calling getEstimate. #782 2024-01-26 04:50:54 -05:00
213171f4b7 Add price tiering for Resq 2 App and TAPI. #782 2024-01-26 04:44:18 -05:00
c136b0666b Fix issues found during testing. #782 2024-01-25 03:08:00 -05:00
57fd7fe5ac Fix issues found during testing. #782 2024-01-25 02:23:47 -05:00
bc6364ace5 Add price tier to invoice rules. #782 2024-01-25 02:11:05 -05:00
c5b395d720 Add price tier for battery replacement warranty. #782 2024-01-24 04:02:14 -05:00
b6763bfd3e Add price tier checking for battery sales. #782 2024-01-24 02:24:13 -05:00
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
c17be92f0a Fix errors for item query. #780 2023-12-31 00:46:12 -05:00
80b9f90324 Rename ItemPriceController to ItemController. #780 2023-12-30 23:09:27 -05:00
01e4baa8c4 Add item price controller. #780 2023-12-28 20:41:44 -05:00
e4ffcc0c9d Add controller for item pricing. #780 2023-12-27 22:15:44 -05: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
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
7c09dcac65 Merge branch '746-resq-2-0-final' into 778-add-in-app-support-for-battery-trade-ins
# Conflicts:
#	config/routes/apiv2.yaml
#	src/Controller/CustomerAppAPI/VehicleController.php
2023-11-18 04:36:57 +08:00
Ramon Gutierrez
fb2ca0bbd8 Merge branch '761-add-paramount-insurance-and-paymongo-support-for-resq2-api' into '746-resq-2-0-final'
Resolve "Add Paramount insurance and PayMongo support for RESQ2 API"

See merge request jankstudio/resq!888
2023-11-17 20:28:02 +00:00
Ramon Gutierrez
9bc9b13055 Merge branch '765-change-fax-to-alternative-phone-number' into '746-resq-2-0-final'
Resolve "Change Fax to Alternative Phone Number"

See merge request jankstudio/resq!879
2023-11-17 08:43:21 +00:00
Ramon Gutierrez
4773d6c08c Add trade-in support to invoice generation and JO creation for app #778 2023-11-17 06:30:07 +08:00
Ramon Gutierrez
fd0c9ede26 Merge branch '746-resq-2-0-final' into 778-add-in-app-support-for-battery-trade-ins 2023-11-14 19:25:54 +08:00
Ramon Gutierrez
ef10f7c7b9 Add endpoint for getting estimated trade-in value #778 2023-11-14 19:25:05 +08:00
Korina Cordero
deb26d3aa8 Remove debug message. #770 2023-11-13 18:30:07 +08:00
Korina Cordero
6cf94bb193 Add the new columns to the Resq View All page. #770 2023-11-13 18:27:01 +08:00
Korina Cordero
14d62d044f Make new page to view all Resq app job orders. #770 2023-11-13 15:20:46 +08:00
Korina Cordero
c7b2502f0a Merge branch '746-resq-2-0-final' of gitlab.com:jankstudio/resq into 773-add-a-dropdown-box-in-customer-information-to-indicate-if-customer-is-new-old 2023-11-10 13:46:07 +08:00
Korina Cordero
1ce284578d Merge branch '746-resq-2-0-final' of gitlab.com:jankstudio/resq into 767-enable-viewing-of-jos-locked-to-another-agent 2023-11-10 13:40:52 +08:00
Korina Cordero
24332c0f9b Merge branch '746-resq-2-0-final' of gitlab.com:jankstudio/resq into 773-add-a-dropdown-box-in-customer-information-to-indicate-if-customer-is-new-old 2023-11-10 13:39:12 +08:00
Korina Cordero
91edfa6ef0 Fix issues found during testing. #773 2023-11-10 13:35:49 +08:00
Korina Cordero
005f891057 Fix issues found during testing. #773 2023-11-10 13:29:52 +08:00
Korina Cordero
c77591fe01 Fix issues during testing. #773 2023-11-09 18:08:59 +08:00
Korina Cordero
fd28be75d1 Add command to update flag_cust_new for existing job orders. Rename flag for consistency. #773 2023-11-09 18:03:17 +08:00
Korina Cordero
806418db52 Fix checking for customer job orders. #773 2023-11-09 16:30:57 +08:00
Korina Cordero
35456cfb19 Add new field for job order for new customers. Add saving of new field for job orders from admin panel and third party API. #773 2023-11-09 12:07:26 +08:00
Ramon Gutierrez
e070d6df18 Merge branch '746-resq-2-0-final' into 768-add-timer-in-jo-list-to-show-real-time-dispatch-time
# Conflicts:
#	templates/job-order/list.all.html.twig
2023-11-09 06:16:24 +08:00
Ramon Gutierrez
ac5683f7f1 Add dispatch timer to list of all JOs view #768 2023-11-09 06:10:51 +08:00
Korina Cordero
8ed1434353 Add service type to View All page. Replace Battery Facilitated By to Assigned Hub in View All Page. #769 2023-11-08 15:17:32 +08:00
Ramon Gutierrez
d44323c097 Add late documentation fields to ticket form #774 2023-11-07 04:02:33 +08:00
Ramon Gutierrez
561a280647 Add late documentation fields to ticket table #774 2023-11-07 03:34:56 +08:00
Korina Cordero
20a6029671 Add view only form for job order. #767 2023-10-27 17:53:10 +08:00
Ramon Gutierrez
ff753d5452 Remove initial 0 from mobile number passed to paymongo checkout api #761 2023-10-23 12:42:09 +08:00
Ramon Gutierrez
2432a08c4d Add support for transient status between making a payment and receiving the webhook #761 2023-10-23 01:17:05 +08:00
Korina Cordero
a29c31d3de Change Fax to Alternative Phone. #765 2023-10-20 13:45:42 +08:00
Ramon Gutierrez
b1ff62d9ec Add back insurance status to vehicle list so latest status can be displayed #761 2023-10-17 14:43:06 +08:00
Ramon Gutierrez
ac2cf864f2 Handle expiry date from insurance completed callback #761 2023-10-13 17:38:03 +08:00
Ramon Gutierrez
708e9a67cc Update insurance callback handler to expect formdata #761 2023-10-13 14:13:57 +08:00
Ramon Gutierrez
38262151e8 Add dates to vehicle info insurance info #761 2023-10-11 17:06:37 +08:00
Ramon Gutierrez
502e9a11cd Add customer vehicle id to insurance FCM notifications #761 2023-10-11 15:39:07 +08:00
Ramon Gutierrez
da87b386a3 Add changelog to insurance info on vehicle endpoint #761 2023-10-09 17:02:23 +08:00
Ramon Gutierrez
d3054760d3 Add external transaction id to vehicle info endpoint #761 2023-10-09 16:56:41 +08:00
Ramon Gutierrez
c332757a53 Fix paymongo handler not checking for the correct payload parameter on validation #761 2023-10-09 16:35:06 +08:00
Ramon Gutierrez
516fbcfcba Add missing dependency to insurance callback handler #761 2023-10-09 15:51:33 +08:00
Ramon Gutierrez
c0c6fe26f7 Fix wrong parameter being checked for invalid insurance callback #761 2023-10-09 15:50:28 +08:00
Ramon Gutierrez
cbe84d1cc8 Set insurance callback handler to process raw json body #761 2023-10-09 15:48:05 +08:00
Ramon Gutierrez
e3a79361bd Remove auth from insurance listener. Fail silently if invalid callback given #761 2023-10-09 14:05:25 +08:00
Ramon Gutierrez
9b616cf398 Handle insurance callbacks, add support for non-JO related FCM notifications #761 2023-10-09 01:15:12 +08:00
Ramon Gutierrez
dd9c9dd0ec Add endpoint for getting individual vehicle info #761 2023-09-26 04:53:13 +08:00
Ramon Gutierrez
38023bdb00 Add insurance information to customer vehicle endpoint #761 2023-09-20 20:40:00 +08:00
Ramon Gutierrez
a002da6aad Add entity null check for paymongo webhooks #761 2023-09-20 06:14:22 +08:00
Ramon Gutierrez
ee021da453 Handle paymongo webhooks #761 2023-09-20 06:08:00 +08:00
Ramon Gutierrez
c5a8bda95a Return premium amount on insurance application endpoint #761 2023-09-09 00:42:42 +08:00
Korina Cordero
4dbd2377f4 Add Shopify to TransactionOrigin. #763 2023-09-08 15:31:58 +08:00
Ramon Gutierrez
95f771c252 Update field requirements for is_public and vehicle_use_type #761 2023-09-07 06:54:30 +08:00
Ramon Gutierrez
db75e7becd Add insurance endpoints, insurance and paymongo connectors #761 2023-09-06 04:05:15 +08:00
Ramon Gutierrez
8c11ec9e8f
Merge branch '759-add-inventory-column-to-job-order-details-report' into '746-resq-2-0-final'
Resolve "Add inventory column to Job Order Details Report"

See merge request jankstudio/resq!873
2023-09-05 20:00:36 +00:00
Korina Cordero
041248ae0c Set jumpstart fee for motolite users, depending on JO source. #760 2023-09-04 15:36:44 +08:00
Korina Cordero
d00b211363 Merge branch '746-resq-2-0-final' of gitlab.com:jankstudio/resq into 759-add-inventory-column-to-job-order-details-report 2023-08-29 10:15:09 +08:00
Korina Cordero
fc95f781d8 Fix issue of jumpstart for motolite user. #758 2023-08-25 09:42:42 +08:00
Korina Cordero
f98b3e170c Merge branch '746-resq-2-0-final' of gitlab.com:jankstudio/resq into 759-add-inventory-column-to-job-order-details-report 2023-08-25 00:25:28 +00:00
Korina Cordero
80c762d463 Add inventory to the Job Order Details report. #759 2023-08-24 09:04:40 +00:00
Korina Cordero
4f13114649 Add inventory count to job order. Add saving of inventory count when assigning hub. #759 2023-08-24 07:29:06 +00:00
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