Commit graph

3016 commits

Author SHA1 Message Date
Ramon Gutierrez
f3992f05fc Update apiv2 app version check to include OS #746 2023-08-02 16:39:30 +08:00
Ramon Gutierrez
e212e2d29a Merge branch '755-resq-2-fix-display-of-discount-type' into '746-resq-2-0-final'
Resolve "RESQ 2: Fix display of discount type"

See merge request jankstudio/resq!869
2023-07-28 09:27:23 +00:00
Korina Cordero
458a34c6a8 Fix setting of promo for invoice. #755 2023-07-28 05:58:03 +00:00
Ramon Gutierrez
1704235bbd Add image for premium excel battery #746 2023-07-26 17:05:50 +08:00
Ramon Gutierrez
0708ebdca9 Fix vertical centering on battery images #746 2023-07-24 16:01:31 +08:00
Ramon Gutierrez
00eb5d1a9d Fix aspect ratio of stock battery images #746 2023-07-24 15:46:12 +08: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
Ramon Gutierrez
18c893cc6e Merge branch '753-resq-2-set-invoice-criteria-correctly-in-getestimate' into '746-resq-2-0-final'
Resolve "RESQ 2: Set invoice criteria correctly in getEstimate"

See merge request jankstudio/resq!868
2023-07-21 06:34:40 +00: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
Ramon Gutierrez
49ff4b604b Merge branch '752-resq-2-fix-return-values-for-invoice-data' into '746-resq-2-0-final'
Resolve "RESQ 2: Fix return values for invoice data"

See merge request jankstudio/resq!867
2023-07-20 02:30:51 +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
9b75993d3d Merge branch '751-resq-2-test-fix-for-fcm-notification-priority' into '746-resq-2-0-final'
Change dependency for fcm to forked lib with high priority set #751

See merge request jankstudio/resq!866
2023-07-19 10:04:54 +00:00
Ramon Gutierrez
6d6662611d Change dependency for fcm to forked lib with high priority set #751 2023-07-19 17:57:05 +08:00
Ramon Gutierrez
0eef2449e8 Fix duplicate fcm notification issue #746 2023-07-19 16:14:49 +08:00
Ramon Gutierrez
c2ff927f1f Merge branch '750-resq-2-fix-computation-issue-for-jo-from-resq-1-app' into '746-resq-2-0-final'
Fix the same issue in resq 2 app. #750

See merge request jankstudio/resq!865
2023-07-19 07:43:33 +00:00
Korina Cordero
4f70fc437c Fix the same issue in resq 2 app. #750 2023-07-19 07:41:48 +00:00
Ramon Gutierrez
bc47873ed1 Merge branch '750-resq-2-fix-computation-issue-for-jo-from-resq-1-app' into '746-resq-2-0-final'
Resolve "RESQ 2: Fix computation issue for JO from Resq 1 app"

See merge request jankstudio/resq!864
2023-07-19 07:18:09 +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
Ramon Gutierrez
a78c08b7a2 Merge branch '749-resq-2-fix-api-responses-in-capi-calls' into '746-resq-2-0-final'
Resolve "RESQ 2: Fix API responses in CAPI calls"

See merge request jankstudio/resq!863
2023-07-18 06:20:55 +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
Ramon Gutierrez
20301b6b98 Merge branch '748-fuel-price-update-for-resq-2' into '746-resq-2-0-final'
Resolve "Fuel Price Update for Resq 2"

See merge request jankstudio/resq!862
2023-07-13 13:43:27 +00:00
Korina Cordero
97917cf49b Updated fuel prices. #748 2023-07-12 07:49:30 +00:00
Ramon Gutierrez
f26d6284f3 Merge branch '744-new-invoice-service' into '746-resq-2-0-final'
Resolve "New invoice service"

See merge request jankstudio/resq!860
2023-07-10 12:48: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
ee9031a8f3 Merge branch '745-make-required-initial-concern-of-customer-and-notes-on-initial-concern-of-customer' into 'master'
Resolve "Make required Initial Concern of Customer and Notes on Initial Concern of Customer"

Closes #745

See merge request jankstudio/resq!859
2023-06-18 23:54:01 +00: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
5540084416 Fix translation locations #730 2023-06-14 15:33:29 +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