rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions
2245 commits 749 branches 8 tags 145 MiB
Commit graph

2245 commits

This branch
This branch
All branches
Author SHA1 Message Date
Korina Cordero
11cdb161f0 Merge branch '459-cmb-add-responsible_party-to-jo' into '424-cmb-release' 
Resolve "CMB - add responsible_party to JO"

See merge request jankstudio/resq!534
 2020-08-05 08:10:25 +00:00
Korina Cordero
5942575fde Add responsible_party field to job order entity and JO forms. #459 2020-08-05 08:03:46 +00:00
Korina Cordero
1dabdee4b0 Merge branch '456-cmb-add-rider-s-finish-time-in-jo-list' into '424-cmb-release' 
Add finish date column to list of all job orders. #456

See merge request jankstudio/resq!532
 2020-08-05 04:04:08 +00:00
Korina Cordero
407c860582 Add finish date column to list of all job orders. #456 2020-08-05 03:51:40 +00:00
Korina Cordero
46bcf7f209 Fix zoom issue in dashboard map. #424 2020-08-04 08:08:56 +00:00
Korina Cordero
117974d2cb Add CustomerNotWaitReason. #453 2020-08-04 08:00:21 +00:00
Korina Cordero
8f6aa72cc0 Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into 424-cmb-release 2020-08-04 07:57:15 +00:00
Korina Cordero
8a026ef44a Add fix to dashboard map zoom error. #424 2020-08-04 07:52:27 +00:00
Kendrick Chan
e3b189b7ae Merge branch 'revert-fdce6c02' into '424-cmb-release' 
Revert "Add name to rider label. #424"

See merge request jankstudio/resq!531
 2020-08-04 05:39:19 +00:00
Kendrick Chan
55a4455586 Revert "Add name to rider label. #424" 
This reverts commit fdce6c02a4
 2020-08-04 05:39:07 +00:00
Korina Cordero
4857645e18 Merge branch '455-resq-add-lazada-as-source-of-transactions-on-crm' into '453-resq-july-30-release' 
Resolve "Resq - Add Lazada as Source of transactions on CRM"

See merge request jankstudio/resq!530
 2020-08-04 03:46:30 +00:00
Korina Cordero
21c1535e89 Add Lazada to Transaction Origin. #455 2020-08-04 03:45:23 +00:00
Korina Cordero
7b8fe8c9e6 Merge branch '454-resq-dropdown-of-reasons-for-customers-not-willing-to-wait' into '453-resq-july-30-release' 
Resolve "Resq - dropdown of reasons for customers not willing to wait"

See merge request jankstudio/resq!529
 2020-08-04 03:35:45 +00:00
Korina Cordero
78d0f4b150 Change text field to dropdown for reasons why customer will not wait. #454 2020-08-04 03:32:51 +00:00
Korina Cordero
cf6793a323 Merge branch '449-resq-dropdown-for-cancellation-reasons' into '453-resq-july-30-release' 
Resolve "Resq - dropdown for cancellation reasons"

See merge request jankstudio/resq!528
 2020-08-04 02:30:36 +00:00
Korina Cordero
a526b7bee5 Fix issue when user cancels the cancellation. #449 2020-08-04 02:27:44 +00:00
Korina Cordero
2e9a5585d4 Add dropdown for cancellation reasons. #449 2020-08-03 10:58:36 +00:00
Korina Cordero
4cd75acb46 Add updating of landmark, willing to wait, and reason when updating JO form. #453 2020-07-31 01:42:50 +00:00
Korina Cordero
3af78fd49b Add checking for SSL_ENABLE for Dashboard. #453 2020-07-30 03:23:03 +00:00
Korina Cordero
ca37b72d57 Check if role has permission to fulfill cancelled orders. #453 2020-07-29 05:22:33 +00:00
Korina Cordero
8e91f9f76b Merge branch '445-resq-tickbox-for-customer-willing-to-wait' into '453-resq-july-30-release' 
Resolve "Resq - tickbox for customer willing to wait"

See merge request jankstudio/resq!527
 2020-07-28 10:12:17 +00:00
Korina Cordero
84042a6bb9 Merge branch '447-resq-landmark-required-in-job-order' into '453-resq-july-30-release' 
Make Landmark field in JO required. #447

See merge request jankstudio/resq!526
 2020-07-28 10:11:30 +00:00
Korina Cordero
964dce9842 Add Willing to Wait tickbox and Reason for not waiting text field. #445 2020-07-28 10:10:59 +00:00
Korina Cordero
18dd63ac16 Make Landmark field in JO required. #447 2020-07-28 08:07:56 +00:00
Korina Cordero
4003ddb489 Merge branch '443-resq-add-battery-facilitated-by-in-view-all-page' into '453-resq-july-30-release' 
Resolve "Resq - add Battery Facilitated By in View All page"

See merge request jankstudio/resq!525
 2020-07-28 07:45:12 +00:00
Korina Cordero
acfea99040 Merge branch '442-resq-cancelled-jo-can-be-fulfilled' into '453-resq-july-30-release' 
Resolve "Resq - cancelled JO can be fulfilled"

See merge request jankstudio/resq!524
 2020-07-28 07:44:56 +00:00
Korina Cordero
a2b91818fb Merge branch '444-resq-include-date-filter-in-hub-view' into '453-resq-july-30-release' 
Add date filter for hub view. #444

See merge request jankstudio/resq!523
 2020-07-28 07:44:39 +00:00
Korina Cordero
ed0eefc1d8 Add Battery Facilitated By column in View All. #443 2020-07-28 06:48:40 +00:00
Korina Cordero
886ed94d88 Merge branch '444-resq-include-date-filter-in-hub-view' of gitlab.com:jankstudio/resq into 443-resq-add-battery-facilitated-by-in-view-all-page 2020-07-28 06:15:39 +00:00
Korina Cordero
c3e36ad055 Add fulfill for cancelled job orders. #442 2020-07-28 05:58:21 +00:00
Korina Cordero
fdce6c02a4 Add name to rider label. #424 2020-07-27 09:49:53 +00:00
Korina Cordero
a432def97b Add date start to list of job orders behind schedule. #424 2020-07-27 07:48:10 +00:00
Korina Cordero
e85139b864 Add date start to the list of JOs in View All and Open. #424 2020-07-27 07:38:13 +00:00
Korina Cordero
ed53e494b4 Fix bug where JO goes back to assigned when updated. #424 2020-07-24 08:57:33 +00:00
Korina Cordero
d61d71804d Return empty array for job order when no ongoing job order. #424 2020-07-24 06:42:38 +00:00
Korina Cordero
afbe3aa00b Add route to fulfill a cancelled job order. #442 2020-07-23 10:34:01 +00:00
Korina Cordero
505177360e Add date filter for hub view. #444 2020-07-23 08:58:41 +00:00
Korina Cordero
febd4d6e09 Comment out the error_log for header longitude and latitude. #424 2020-07-23 06:53:01 +00:00
Korina Cordero
ff83dec5ce Add upload photo event type. #424 2020-07-23 04:40:48 +00:00
Korina Cordero
eadcd4604a Add getHeaderCoordinates to rider api. #424 2020-07-23 03:55:33 +00:00
Korina Cordero
232ebfe3fc Add RIDER_FINISH event. Add date_complete to API response. #424 2020-07-23 02:50:13 +00:00
Korina Cordero
37fef914d9 Add checking for null for other images. #424 2020-07-22 06:35:12 +00:00
Korina Cordero
1cba6b0670 Merge branch '441-cmb-limit-uploaded-photos-to-four' into '424-cmb-release' 
Commented out the Other Images section. #441

See merge request jankstudio/resq!519
 2020-07-21 10:05:34 +00:00
Korina Cordero
6ed3c52e49 Commented out the Other Images section. #441 2020-07-21 10:04:47 +00:00
Korina Cordero
99eae1fae8 Merge branch '441-cmb-limit-uploaded-photos-to-four' into '424-cmb-release' 
Resolve "CMB - limit uploaded photos to four"

See merge request jankstudio/resq!518
 2020-07-21 09:59:25 +00:00
Korina Cordero
b680349e56 Limit uploaded photos to four. Rename images to generic names. #441 2020-07-21 09:58:06 +00:00
Korina Cordero
1bf29f86e6 Merge branch '438-cmb-rider-icon-should-be-green-when-rider-rejects-jo' into '424-cmb-release' 
Resolve "CMB - rider icon should be green when rider rejects JO"

See merge request jankstudio/resq!516
 2020-07-21 07:20:27 +00:00
Korina Cordero
127b4a6f7b Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into 438-cmb-rider-icon-should-be-green-when-rider-rejects-jo 2020-07-21 07:17:56 +00:00
Korina Cordero
34b71fe9e7 Merge branch '437-cmb-rider-cannot-go-offline-if-rider-has-assigned-jos' into '424-cmb-release' 
Resolve "CMB - rider cannot go offline if rider has assigned JOs"

See merge request jankstudio/resq!515
 2020-07-21 07:14:17 +00:00
Korina Cordero
d7a5bd7dda Merge branch '424-cmb-release' of gitlab.com:jankstudio/resq into 437-cmb-rider-cannot-go-offline-if-rider-has-assigned-jos 2020-07-21 07:12:46 +00:00