Commit graph

2873 commits

Author SHA1 Message Date
Korina Cordero
f03d2bf7ef Set third party source when creating JO from third party. #737 2023-02-14 03:12:24 +00:00
Korina Cordero
f8da38fd26 Add job source to api user. #737 2023-02-13 09:00:58 +00:00
Korina Cordero
0a2bc1741b Add JobOrderSource entity for callback. Add CRUD for job order source. #737 2023-02-13 04:14:17 +00:00
87846040b6 Merge branch 'staging' into 'master'
Staging

See merge request jankstudio/resq!852
2023-02-09 10:19:33 +00: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
Korina Cordero
879c80f7be Add sending of SMS notification to hub when rejected. #736 2023-02-07 07:15:43 +00: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
51a2111552 Merge branch '735-add-rider-status-to-rider-assignment-table-in-assignment-form' into 'staging'
Add rider status to rider assignment table. #735

See merge request jankstudio/resq!849
2023-02-06 10:30:47 +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
Korina Cordero
4c4a8da7e6 Add rider count columns to Nearest Hubs table in Dispatch page. #734 2023-02-03 08:36:43 +00: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
935dc15101 Merge branch '729-fuel-price-updates' into 'master'
Resolve "Fuel price updates"

Closes #729

See merge request jankstudio/resq!844
2023-01-27 13:30:38 +00:00
Korina Cordero
fd2a1b35bc Update fuel prices. #729 2023-01-27 06:02:25 +00:00
c8d22a0dfb Merge branch '726-add-sales-invoice-number-field-to-warranty' into 'master'
Resolve "Add sales invoice number field to warranty"

Closes #726

See merge request jankstudio/resq!841
2023-01-19 07:58:38 +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
54b5d0deef Fix layout of form. #725 2022-12-19 10:09:19 +00:00
d5245844ac Merge branch '724-fuel-price-changes' into 'master'
Resolve "Fuel price changes"

Closes #724

See merge request jankstudio/resq!839
2022-12-19 09:09:58 +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
31b246fca0 Merge branch '723-fix-issue-with-raffle-reports-2' into 'master'
Resolve "Fix issue with raffle reports"

Closes #723

See merge request jankstudio/resq!838
2022-12-16 11:19:58 +00:00
Korina Cordero
6d6c855feb Fixed setting of time for date time for query. #723 2022-12-16 08:02:47 +00:00
524d99db08 Merge branch '720-create-service-to-filter-warranty-entries-for-warranty-raffle-report' into 'master'
Resolve "Create service to filter warranty entries for warranty raffle report"

Closes #720

See merge request jankstudio/resq!835
2022-11-22 07:42:16 +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
8776d69a92 Merge branch '718-warranty-raffle-report-changes' into 'master'
Resolve "Warranty Raffle Report Changes"

Closes #718

See merge request jankstudio/resq!833
2022-11-16 10:42:42 +00:00
Korina Cordero
c70dbd3b52 Add action to report. Modify transaction id in report. #718 2022-11-16 10:41:35 +00:00
f0d14b7d77 Merge branch '717-log-warranty-activities-from-app' into 'master'
Resolve "Log warranty activities from app"

Closes #717

See merge request jankstudio/resq!832
2022-11-14 12:43:39 +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
a5640914bf Merge branch '715-modify-number-of-days-for-sending-warranty-sms-expiry-notification' into 'master'
Resolve "Modify number of days for sending warranty sms expiry notification"

Closes #715

See merge request jankstudio/resq!830
2022-10-27 12:56:34 +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
9f2027fcc1 Merge branch '714-fuel-price-update' into 'master'
Resolve "Fuel price update"

Closes #714

See merge request jankstudio/resq!829
2022-10-20 14:22:20 +00:00
Korina Cordero
ab77cb6260 Update fuel prices. #714 2022-10-19 01:11:09 +00:00