Korina Cordero
|
a1a60100f5
|
Add new event type for perform. Add event creation when JO is performed. #424
|
2020-06-25 03:11:08 +00:00 |
|
Korina Cordero
|
47a52782f7
|
Remove prefix from channel. #424
|
2020-06-24 07:55:50 +00:00 |
|
Korina Cordero
|
5822ea84a6
|
Add fix for rider being unavailable after completing a JO. #424
|
2020-06-23 09:54:50 +00:00 |
|
Korina Cordero
|
0f5bf2e8d6
|
Fix error when rider is not selected. #424
|
2020-06-23 09:40:39 +00:00 |
|
Korina Cordero
|
21ae94c5b6
|
Change default mode of payment to credit card. #424
|
2020-06-23 06:06:15 +00:00 |
|
Korina Cordero
|
093a249689
|
Add JO status checking for getOngoingJobOrder. #424
|
2020-06-23 02:33:24 +00:00 |
|
|
|
16b136b0d3
|
Make sure blank job_order is in data for get ongoing job order rider api call #424
|
2020-06-23 00:10:08 +08:00 |
|
Korina Cordero
|
9d41ecb228
|
Add fix for security checking for verifyJobOrder. #424
|
2020-06-22 11:39:58 +00:00 |
|
Korina Cordero
|
47eaa6488f
|
Add display name for payment method in rider API JO data. #424
|
2020-06-22 10:56:41 +00:00 |
|
Korina Cordero
|
42d086ff5d
|
Add sending of mqtt event when JO is assigned to rider. #424
|
2020-06-22 10:05:01 +00:00 |
|
Korina Cordero
|
0f0169cff4
|
Fix return value for verifyJobOrder. #424
|
2020-06-22 04:32:58 +00:00 |
|
Korina Cordero
|
db4ab726ab
|
Fix bug in completeJobOrder. #424
|
2020-06-22 04:00:08 +00:00 |
|
Korina Cordero
|
2f8dca3dbc
|
Fix responses for verifyJobOrder. #424
|
2020-06-22 03:45:50 +00:00 |
|
Korina Cordero
|
3abb6f0efb
|
Add verifyJobOrder API call. #424
|
2020-06-22 03:13:41 +00:00 |
|
|
|
eb2d173ea7
|
Add email and customer signature to complete call in rider api #424
|
2020-06-21 19:14:30 +08:00 |
|
|
|
2b13adffa0
|
Add customer email to jo details in rider api #424
|
2020-06-21 17:04:41 +08:00 |
|
|
|
f519ec01dc
|
Set paid status in payment call in rider api #424
|
2020-06-21 16:46:11 +08:00 |
|
|
|
1e3b621a91
|
Send null for extra images if blank for rider api #424
|
2020-06-21 16:27:43 +08:00 |
|
|
|
d59174d721
|
Replace speedomtr with speedometer #424
|
2020-06-21 16:26:10 +08:00 |
|
|
|
4ec5ddd993
|
Add mode of payment to payment in rider api #424
|
2020-06-21 15:52:34 +08:00 |
|
|
|
fe363e1df6
|
Add request object to format job order data method #424
|
2020-06-21 14:49:31 +08:00 |
|
|
|
60323acce3
|
Add request to URL extra image generation #424
|
2020-06-21 14:48:27 +08:00 |
|
|
|
ce9a2f42b9
|
Add images and odometer to JO info #424
|
2020-06-21 14:44:10 +08:00 |
|
|
|
59e6e9eb5c
|
Support null date_status_change for rider api #424
|
2020-06-20 21:49:35 +08:00 |
|
|
|
5e75608402
|
Add date_status_change to job order data in rider api #424
|
2020-06-20 21:41:21 +08:00 |
|
|
|
0d89cab165
|
Add date_status_change for job order entity and refactor rider api job order data generation #424
|
2020-06-20 21:19:56 +08:00 |
|
|
|
ef7e362c7d
|
Fix syntax bugs #424
|
2020-06-20 16:46:00 +08:00 |
|
|
|
943c01e5d9
|
Add jo perform rider api call for CMB #424
|
2020-06-20 16:38:08 +08:00 |
|
Korina Cordero
|
5b96e03557
|
Add other_images parameter to upload photos API calls. #428
|
2020-06-19 11:33:49 +00:00 |
|
Korina Cordero
|
6473c2e344
|
Add getPaymentMethods and getCancelReason API calls to rider API. Add phone_landline to the JO responses. #428
|
2020-06-19 07:14:12 +00:00 |
|
Korina Cordero
|
332f9687a2
|
Add getOngoingJobOrder to rider API. #428
|
2020-06-19 06:19:11 +00:00 |
|
Korina Cordero
|
7a2996d4e5
|
Add getStatus to rider API. #428
|
2020-06-19 04:16:45 +00:00 |
|
Korina Cordero
|
90697af64b
|
Merge branch '422-cmb-no-riders-in-list-when-rider-is-unavailable' of gitlab.com:jankstudio/resq into 426-command-to-copy-configuration-files
|
2020-06-17 08:20:12 +00:00 |
|
Korina Cordero
|
753c77773d
|
Use CMBServiceType to check service type. #425
|
2020-06-17 02:03:50 +00:00 |
|
Korina Cordero
|
661e048206
|
Add checking for rider availability when saving JO. #422
|
2020-06-16 03:58:39 +00:00 |
|
Korina Cordero
|
18081d0903
|
Add title field to error object. #421
|
2020-06-12 10:35:20 +00:00 |
|
Korina Cordero
|
334b0f1c99
|
Add uploadFinishPhotos API call. #421
|
2020-06-09 02:57:48 +00:00 |
|
Korina Cordero
|
ce64a1b64d
|
Add uploadArrivePhotos API call. #421
|
2020-06-08 10:39:57 +00:00 |
|
Korina Cordero
|
8f108c18cb
|
Modify name of stype_id parameter to service_type for clarity. #421
|
2020-06-05 09:52:23 +00:00 |
|
Korina Cordero
|
760fa7acf3
|
Add get job order history for this month and last month. #421
|
2020-06-04 09:47:58 +00:00 |
|
Korina Cordero
|
b41b5ea29b
|
Modify getJobOrderHistory. #421
|
2020-06-04 06:02:53 +00:00 |
|
Korina Cordero
|
a0ee7b32bc
|
Add setOdometer API call. Modify url routes for some calls for easier reading. #421
|
2020-06-04 03:32:05 +00:00 |
|
Korina Cordero
|
b6c54615ad
|
Add api calls: payment, complete, cancel, reject for job orders. #421
|
2020-06-03 10:34:56 +00:00 |
|
Korina Cordero
|
0e69eb4943
|
Add completeJobOrder and setActiveJobOrder API calls. #421
|
2020-06-02 09:25:43 +00:00 |
|
Korina Cordero
|
79b19a61f6
|
Add startJobOrder API call. Add RIDER_START event type. #421
|
2020-06-02 08:03:31 +00:00 |
|
Korina Cordero
|
22c1fab15c
|
Add generateInvoice API call. #421
|
2020-06-02 07:41:47 +00:00 |
|
Korina Cordero
|
ce0240d001
|
Add event types for CMB. Add JO in transit API call. #421
|
2020-06-02 06:35:31 +00:00 |
|
Korina Cordero
|
e74d4061ba
|
Add checking for assigned rider for JO for getJobOrder. #421
|
2020-06-02 04:27:10 +00:00 |
|
Korina Cordero
|
dbdde5cdde
|
Change which flag is set when rider logs in and logs out. Add goOnline and goOffline API calls. #421
|
2020-06-02 03:40:55 +00:00 |
|
Korina Cordero
|
af9be59d8d
|
Change getActiveJobOrders to getAssignedJobOrders. #421
|
2020-06-01 09:30:28 +00:00 |
|
Korina Cordero
|
2ea0111b1e
|
Add generate invoice API call. #420
|
2020-06-01 09:15:05 +00:00 |
|
Korina Cordero
|
1842898c11
|
Add viewActiveJobOrders API call. #420
|
2020-06-01 06:29:11 +00:00 |
|
Korina Cordero
|
8730ab4ea3
|
Add viewJobOrderHistory API call to rider api. #420
|
2020-06-01 04:37:12 +00:00 |
|
Korina Cordero
|
2ea5bfe193
|
Add changes to CMB's rider API handler. #420
|
2020-06-01 02:26:04 +00:00 |
|
Korina Cordero
|
7b60ec7c5f
|
Move the setting of JO search fields to the entity. Move the sql script to the migration folder. #419
|
2020-05-27 08:13:51 +00:00 |
|
Korina Cordero
|
2a0bee8d8d
|
Create sql command to update the job orders for the search fields. Modify search to use the JO search fields. Add saving of search fields when adding a JO. #419
|
2020-05-27 07:05:44 +00:00 |
|
Korina Cordero
|
f21753bd07
|
Comment out checking of dpa consent. Comment out access to dpa consent. #418
|
2020-05-25 03:33:44 +00:00 |
|
|
|
2aa6d417b7
|
Merge branch '408-resq-additional-dpa-behavior' into 'master'
Resolve "Resq - additional dpa behavior"
Closes #408
See merge request jankstudio/resq!471
|
2020-05-21 01:50:57 +00:00 |
|
Korina Cordero
|
c5eaf348a8
|
Filter hubs in hubs dropdown to those with flag_hub_view set to true. Add flag_hub_view to Hub entity. Filter JOs whose status are not cancelled or fulfilled. #411
|
2020-05-20 05:22:08 +00:00 |
|
Korina Cordero
|
ef3f5d5cec
|
Add route to edit hub view form. Remove pdf link from hub view. Filter JOs based on selected hub. #410
|
2020-05-19 06:55:55 +00:00 |
|
Korina Cordero
|
25997ae11e
|
Add acl, menu item, template, and route for Hub View. #410
|
2020-05-19 03:30:50 +00:00 |
|
Korina Cordero
|
bbebdb04c8
|
Add checking for email address if email checkbox is checked. #408
|
2020-05-15 09:24:31 +00:00 |
|
Korina Cordero
|
af85a632e5
|
Add acl entry for display of DPA Consent. Add checking when adding/updating customer for DPA consent. #408
|
2020-05-15 08:48:58 +00:00 |
|
|
|
19527e38da
|
Merge branch '401-resq-modify-warrantyhandler-to-use-date_schedule-for-expiry-date-computation' into 'master'
Resolve "Resq - modify WarrantyHandler to use date_schedule for expiry date computation"
Closes #401
See merge request jankstudio/resq!465
|
2020-05-12 01:29:36 +00:00 |
|
|
|
2f80a510b0
|
Merge branch '400-resq-check-jos-with-no-warranty-entries' into 'master'
Resolve "Resq - check JOs with no warranty entries"
Closes #400
See merge request jankstudio/resq!450
|
2020-05-12 01:29:18 +00:00 |
|
Korina Cordero
|
e67c011831
|
Change the start date for warranty expiration computation to date_schedule, instead of date_create or date_fulfilled. #401
|
2020-05-11 06:50:15 +00:00 |
|
|
|
9550e1e46c
|
Fix getClosestOpenHubs bug #403
|
2020-05-09 21:39:53 +08:00 |
|
Korina Cordero
|
24d297b48f
|
Add error log if JO fulfillment cannot created the warranty. Fix for warranty creation issues when creating warranty from existing JO. #400
|
2020-05-07 11:13:43 +00:00 |
|
|
|
106a38499d
|
Fix bug in dr_url passing #394
|
2020-05-03 22:57:47 +08:00 |
|
|
|
d189b8eb18
|
Fix SMS delivery receipt functionality #394
|
2020-05-03 22:50:56 +08:00 |
|
|
|
ff6b4da4df
|
Save records of sms messages when sending #384
|
2020-05-01 14:03:27 +08:00 |
|
Korina Cordero
|
5460b216aa
|
Change function name from updateJobOrder to openEditJobOrder. #377
|
2020-04-15 03:49:31 +00:00 |
|
Korina Cordero
|
4fd8292d2e
|
Fix JO link in dashboard for resq. #377
|
2020-04-15 03:21:47 +00:00 |
|
Korina Cordero
|
db46e5134f
|
Fix for the JO event logs and status issues when editing a JO. #377
|
2020-04-14 09:18:13 +00:00 |
|
Korina Cordero
|
b545750910
|
Add customer distance limit to .env and checking if hub within the limit. #377
|
2020-04-14 07:21:10 +00:00 |
|
|
|
32b4c8546d
|
Make rider available when they arrive at hub #374
|
2020-04-13 21:10:29 +08:00 |
|
|
|
46f46436fe
|
Tag rider as unavailable on rapi payment call #374
|
2020-04-13 20:56:46 +08:00 |
|
|
|
9c0f86e588
|
Filter only open hubs for API autoassign #374
|
2020-04-11 11:44:45 +08:00 |
|
Korina Cordero
|
6c02c30370
|
Update function name. Add checking for empty response in getBranchesInventory. #374
|
2020-04-08 02:32:16 +00:00 |
|
Korina Cordero
|
eb5710b846
|
Create InventoryManager service to connect to API. #374
|
2020-04-07 10:10:44 +00:00 |
|
Korina Cordero
|
c62775c990
|
Moved the autoAssign code into a service. #374
|
2020-04-07 03:27:39 +00:00 |
|
Korina Cordero
|
9a661763a0
|
Add auto assign to controller. #374
|
2020-04-06 09:46:54 +00:00 |
|
Korina Cordero
|
d61d82b6e7
|
Add default value false to checking for new customer. #367
|
2020-03-10 06:22:25 +00:00 |
|
Korina Cordero
|
c4da604ac8
|
Made plate number a required field if new customer. #367
|
2020-03-10 06:07:29 +00:00 |
|
|
|
8e3df8f1c4
|
Treat blank serial as null to avoid unique exception in db #270
|
2020-03-06 07:42:00 +08:00 |
|
Korina Cordero
|
624cf2fb7d
|
Return the additional values to template. #365
|
2020-03-05 07:17:03 +00:00 |
|
Korina Cordero
|
e93b6432b0
|
Add view all form for cmb. #365
|
2020-03-05 06:26:50 +00:00 |
|
|
|
977559b88d
|
Set priority properly for job order and handle priority down button #360
|
2020-03-02 08:33:50 +08:00 |
|
|
|
0d148d8d50
|
Merge branch '359-cmb-remove-color-from-jo-pdf' into '270-final-cmb-fixes'
Resolve "CMB - remove color from JO pdf"
See merge request jankstudio/resq!401
|
2020-02-27 05:24:30 +00:00 |
|
Korina Cordero
|
a0f7ca6abe
|
Fix editRoute parameters for CMB. #357
|
2020-02-27 02:07:30 +00:00 |
|
Korina Cordero
|
164e091c15
|
Remove color field from pdf form. #359
|
2020-02-25 08:39:30 +00:00 |
|
Korina Cordero
|
3d40bc6238
|
Remove links to onestep edit from templates for resq. Fix for getEditRoute issues found during testing. #357
|
2020-02-25 07:18:55 +00:00 |
|
Korina Cordero
|
6d14677bd7
|
Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 357-transition-fix-resq-s-geteditroute
|
2020-02-25 03:38:18 +00:00 |
|
Korina Cordero
|
d534ce3241
|
Add getEditRoute for resq. #357
|
2020-02-25 03:37:58 +00:00 |
|
|
|
5b19302752
|
Merge branch '354-cmb-and-resq-move-invoice-related-code-out-of-jocontroller' into '270-final-cmb-fixes'
Resolve "CMB and Resq - move invoice-related code out of JOController"
See merge request jankstudio/resq!395
|
2020-02-25 03:35:53 +00:00 |
|
Korina Cordero
|
22be1eaf5a
|
Fix edit for walkin JOs. #270
|
2020-02-24 10:33:13 +00:00 |
|
|
|
214e44405c
|
Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 270-final-cmb-fixes
Conflicts:
src/Controller/JobOrderController.php
|
2020-02-24 16:45:43 +08:00 |
|
|
|
1a0fb13268
|
Fix view all edit button to use one step edit for CMB #270
|
2020-02-24 16:43:27 +08:00 |
|
Korina Cordero
|
230dd41055
|
Add jo_service_charges to one step form. #355
|
2020-02-24 07:57:43 +00:00 |
|
Korina Cordero
|
4b9b3622d5
|
Fix to display service charge amount when loading an existing JO. #355
|
2020-02-24 03:06:47 +00:00 |
|
Korina Cordero
|
9125a0d2fa
|
Moved invoice code out of JO controller. #354
|
2020-02-21 03:22:17 +00:00 |
|
Korina Cordero
|
4a12fb6eb2
|
Change edit to edit onestep edit and walkin. #353
|
2020-02-20 04:12:12 +00:00 |
|
Korina Cordero
|
5ab6514a86
|
Fixed form for onestep when JO is loaded from View All. #347
|
2020-02-19 06:29:31 +00:00 |
|
Korina Cordero
|
1374a91dd4
|
Add checking for transaction origin. #347
|
2020-02-19 05:02:21 +00:00 |
|
Korina Cordero
|
ebc6867c8f
|
Edit for one step JO with service charges. #341
|
2020-02-18 01:42:16 +00:00 |
|
Korina Cordero
|
9a24b08bdd
|
Display existing service charges when editing one step JO. #341
|
2020-02-18 01:15:14 +00:00 |
|
Korina Cordero
|
504d910621
|
Add saving to meta even if service charges are blank. #341
|
2020-02-17 14:56:35 +00:00 |
|
Korina Cordero
|
f9c304422c
|
Add fix when saving an invoice with no service charges. #341
|
2020-02-17 14:43:21 +00:00 |
|
Korina Cordero
|
0cff722c6a
|
Add saving of service charges to JO and Invoice Item. #341
|
2020-02-17 14:18:19 +00:00 |
|
Korina Cordero
|
f3f941e0a0
|
Add service charges to invoice generation. #341
|
2020-02-17 13:24:32 +00:00 |
|
|
|
4ae899925d
|
Merge branch '341-cmb-add-service-charge-dropdown' of gitlab.com:jankstudio/resq into 341-cmb-add-service-charge-dropdown
|
2020-02-17 16:13:12 +08:00 |
|
Korina Cordero
|
663698f087
|
Rename promo to discount in JO service, JO forms, and invoice generator. #341
|
2020-02-17 08:12:51 +00:00 |
|
|
|
34e9091297
|
Fix dropdown for service charges in one-step JO form #341
|
2020-02-17 16:12:35 +08:00 |
|
Korina Cordero
|
984b0428d0
|
Fix for cmb to retain battery in invoice when editing JO. #343
|
2020-02-17 06:19:09 +00:00 |
|
Korina Cordero
|
a15b45173c
|
Fix discount computation. #343
|
2020-02-17 01:02:41 +00:00 |
|
Korina Cordero
|
d439a411a8
|
Change computation of discount for CMB. #343
|
2020-02-14 09:40:08 +00:00 |
|
Korina Cordero
|
ac91960bd7
|
Add mobile phone validation for JO when new customer is created. #340
|
2020-02-14 03:38:37 +00:00 |
|
Korina Cordero
|
6a944eeb16
|
Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 340-cmb-walk-in-customer-form
|
2020-02-14 03:09:57 +00:00 |
|
Korina Cordero
|
034ae108e0
|
Fix saving issue for JOEvent. #340
|
2020-02-14 01:47:08 +00:00 |
|
Korina Cordero
|
d07adc606b
|
Add saving of walkin form. #340
|
2020-02-13 08:53:57 +00:00 |
|
Korina Cordero
|
7e116d8d3e
|
Add function to load walk-in form. #340
|
2020-02-13 07:32:18 +00:00 |
|
Korina Cordero
|
62edf0f12c
|
Tweak validation for mobile phone number. #339
|
2020-02-13 04:04:28 +00:00 |
|
Korina Cordero
|
51e333de8b
|
Merge branch '329-transition-branch-for-cmb-and-resq-merging' of gitlab.com:jankstudio/resq into 339-cmb-mobile-phone-validation-check
|
2020-02-13 02:46:52 +00:00 |
|
Korina Cordero
|
2fb24e4e13
|
Add validation for mobile phone number. #339
|
2020-02-13 02:41:32 +00:00 |
|
Korina Cordero
|
c81a56c6e6
|
Modify the checking if service type is new battery. #336
|
2020-02-12 02:33:14 +00:00 |
|
Korina Cordero
|
4f9e7959b5
|
Merge branch '329-transition-branch-for-cmb-and-resq-merging' of gitlab.com:jankstudio/resq into 336-trans-method-to-check-if-new-battery
|
2020-02-12 01:41:50 +00:00 |
|
Korina Cordero
|
9cd5915e88
|
Add saving of serial when adding/editing/fulfilling a JO. #335
|
2020-02-11 08:09:55 +00:00 |
|
Korina Cordero
|
f0212cc6d4
|
Add checkIfNewBattery function to job order service. Add RiderAPIHandler to the respective services.yaml. #336
|
2020-02-11 05:54:58 +00:00 |
|
Korina Cordero
|
4d8ddc5323
|
Modify the retrieval of the flags from request object. #324
|
2020-02-11 01:49:24 +00:00 |
|
Korina Cordero
|
716f263e6b
|
Make editable the new fields in JO form. #324
|
2020-02-10 08:13:36 +00:00 |
|
Korina Cordero
|
5dc57dc073
|
Add new fields to customer form. #324
|
2020-02-10 05:44:00 +00:00 |
|
Korina Cordero
|
0df0955cb3
|
Add rider assignment handler for resq. #333
|
2020-02-07 08:19:51 +00:00 |
|
Korina Cordero
|
8bbc39ec9e
|
Merge branch '311-cmb-refactor-rapicontroller-into-a-service' of gitlab.com:jankstudio/resq into 329-transition-branch-for-cmb-and-resq-merging
|
2020-02-07 02:24:17 +00:00 |
|
Korina Cordero
|
8dbcd0478d
|
Add riders and dates to query filters. #329
|
2020-02-06 07:29:23 +00:00 |
|
Korina Cordero
|
b7cae5afe2
|
Add getOtherParameters to Resq job order handler. #329
|
2020-02-06 07:21:39 +00:00 |
|
Korina Cordero
|
075c83fb0d
|
Add checking for valid plate number before warranty creation after JO is fulfilled. #311
|
2020-02-06 05:25:30 +00:00 |
|
Korina Cordero
|
1fc64cef8a
|
Add checking for valid plate number before warranty creation after JO is fulfilled. #311
|
2020-02-06 04:59:48 +00:00 |
|
Korina Cordero
|
91182fbc38
|
Remove git conflict message. #311
|
2020-02-05 23:47:53 +00:00 |
|
Korina Cordero
|
36657cbdf0
|
Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 311-cmb-refactor-rapicontroller-into-a-service
|
2020-02-05 08:25:18 +00:00 |
|
Korina Cordero
|
3300400456
|
Move the rest of the functions to the service. #311
|
2020-02-05 08:19:10 +00:00 |
|
Korina Cordero
|
cf783bf1cb
|
Added validations to customer and customer vehicle data. #319
|
2020-02-05 05:28:59 +00:00 |
|
Korina Cordero
|
a3e40de170
|
Add adding of customer and customer vehicle from one step form. #319
|
2020-02-05 03:15:30 +00:00 |
|
|
|
d943015f4a
|
Merge branch '319-cmb-one-step-form-display-rider-distance' of gitlab.com:jankstudio/resq into 319-cmb-one-step-form-display-rider-distance
|
2020-02-05 04:37:33 +08:00 |
|
|
|
746b25ad74
|
Fix one step form for CMB to allow for new customer and vehicle #319
|
2020-02-05 04:36:33 +08:00 |
|
Korina Cordero
|
b6700eed36
|
Add rider and date query parameters for list of to be fulfilled and open job orders. #319
|
2020-02-04 11:15:10 +00:00 |
|
Korina Cordero
|
15bafe2363
|
Fix for query when multiple parameters are passed. #319
|
2020-02-04 10:33:12 +00:00 |
|
Korina Cordero
|
3789871f9a
|
Add rider and date filter to search. #319
|
2020-02-04 08:43:39 +00:00 |
|
Korina Cordero
|
05af87ed9c
|
Move payment to the service. Move updateVehicleBattery to the JO handler for RAPIController. #311
|
2020-01-31 10:05:08 +00:00 |
|
Korina Cordero
|
aa1a2b3bcb
|
Move the hubArrive function to the service. #311
|
2020-01-31 09:04:04 +00:00 |
|
Korina Cordero
|
bf3136da62
|
Move the arrive function to the service. #311
|
2020-01-31 08:53:35 +00:00 |
|
Korina Cordero
|
b651d06ec8
|
Move cancelJobOrder to the service. #311
|
2020-01-31 08:16:11 +00:00 |
|
Korina Cordero
|
de4bf9f271
|
Bug fixes for acceptJobOrder. #311
|
2020-01-31 07:55:26 +00:00 |
|
Korina Cordero
|
becd8d0c17
|
Move acceptJobOrder to the service. #311
|
2020-01-31 06:21:35 +00:00 |
|
Korina Cordero
|
35ccaa73c3
|
Add country code to constructor of RiderAPIHandler service. #311
|
2020-01-31 06:04:18 +00:00 |
|
Korina Cordero
|
3e5ea688bc
|
Move logout and getJobOrder to the service. #311
|
2020-01-31 04:22:27 +00:00 |
|
Korina Cordero
|
c3662cd185
|
Add login to interface. #311
|
2020-01-30 08:53:56 +00:00 |
|
Korina Cordero
|
cbc99778cd
|
Move login to the service. #311
|
2020-01-30 08:52:41 +00:00 |
|
Korina Cordero
|
4d104d38e1
|
Move the register function from controller to service. #311
|
2020-01-30 07:47:34 +00:00 |
|
Korina Cordero
|
10ecd6298a
|
Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 318-error_log-cleanup
|
2020-01-30 04:03:44 +00:00 |
|
Korina Cordero
|
dab8986ad1
|
Remove or comment out error_logs meant for debugging purposes. #318
|
2020-01-30 00:31:01 +00:00 |
|
Korina Cordero
|
bc8ce40b13
|
Add distance from customer to hub to hub table. #314
|
2020-01-28 07:24:14 +00:00 |
|
|
|
6dd3f3377e
|
Merge branch '309-replace-63-in-templates-with-proper-country-code' into '270-final-cmb-fixes'
Resolve "Replace +63 in templates with proper country code"
See merge request jankstudio/resq!350
|
2020-01-28 02:54:08 +00:00 |
|
|
|
86b4601bb8
|
Fix bug in rider cache #270
|
2020-01-28 05:37:41 +08:00 |
|
|
|
4719d89368
|
Add rider cache service #299
|
2020-01-28 04:32:05 +08:00 |
|
|
|
2d6193318a
|
Add ability to remove customer markers via status publish #299
|
2020-01-27 04:04:30 +08:00 |
|
|
|
cba80ddd90
|
Have active job orders loaded from cache in dashboard map #299
|
2020-01-26 00:58:00 +08:00 |
|
|
|
9e00c3f115
|
Fix publishing and subscribing for new / updated JOs #299
|
2020-01-25 05:11:53 +08:00 |
|
|
|
66be351bd3
|
Make MQTT key configurable #299
|
2020-01-24 20:46:25 +08:00 |
|
Korina Cordero
|
5a138ce09f
|
Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 309-replace-63-in-templates-with-proper-country-code
|
2020-01-24 05:37:30 +00:00 |
|
|
|
fe7cfe6c86
|
Refactor RedisClientProvider #299
|
2020-01-24 03:19:51 +08:00 |
|
Korina Cordero
|
2c9f5180e3
|
Move warranty creation when JO is fulfilled to the warranty handler for CMB. #308
|
2020-01-23 07:47:32 +00:00 |
|
Korina Cordero
|
d569c666e3
|
Add warranty creation when JO is fulfilled to ResqJobOrderHandler. #305
|
2020-01-22 08:18:30 +00:00 |
|
Korina Cordero
|
d418f0ff5a
|
Remove hardcoded prefix from customer. Add country code to .env and services.yaml. #307
|
2020-01-22 06:42:28 +00:00 |
|
Korina Cordero
|
d6015978ae
|
Merge branch '270-final-cmb-fixes' of gitlab.com:jankstudio/resq into 307-cmb-fix-customer-hard-coded-country-code
|
2020-01-22 04:54:01 +00:00 |
|
Korina Cordero
|
00816b4226
|
Add warranty creation after job order fulfillment. #304
|
2020-01-21 08:14:05 +00:00 |
|
Korina Cordero
|
c224b1773d
|
Modify query to find customer vehicle using plate number. #302
|
2020-01-20 06:37:29 +00:00 |
|
Korina Cordero
|
260c218724
|
Added one step form for CMB. #270
|
2020-01-16 07:38:54 +00:00 |
|
Korina Cordero
|
99e8485065
|
Display invoice details for editing one step form. #270
|
2020-01-15 02:18:28 +00:00 |
|
Korina Cordero
|
8da95f2ed0
|
Add saving of updated form for one step job order. #270
|
2020-01-14 08:26:39 +00:00 |
|
Korina Cordero
|
3a167f0b38
|
Add links and routes to editing a one step job order form. #270
|
2020-01-14 03:34:00 +00:00 |
|
Korina Cordero
|
79ab60619b
|
Add saving of one step job order data. #270
|
2020-01-10 10:26:32 +00:00 |
|
Korina Cordero
|
ed2975e8d3
|
Add validation when submitting a one step job order. #270
|
2020-01-10 09:53:51 +00:00 |
|
Korina Cordero
|
603919667f
|
Add form tags for the one step form. #270
|
2020-01-09 02:19:24 +00:00 |
|
Korina Cordero
|
eea64645b5
|
Move updating of customer vehicle out of the command and into the warranty service. #290
|
2019-12-23 03:54:01 +00:00 |
|
Korina Cordero
|
10d9e6e5ae
|
Update customer vehicle warranty information when warranty is uploaded. #290
|
2019-12-23 02:04:48 +00:00 |
|
Korina Cordero
|
85483ffab8
|
Add updating of customer vehicle information when warranty is added. #290
|
2019-12-20 13:16:45 +00:00 |
|
Korina Cordero
|
ff56db09b0
|
Add command to update customer vehicle from warranty data. #290
|
2019-12-20 07:30:08 +00:00 |
|
Korina Cordero
|
a10ef2b5d9
|
Fix testing issues found for warranty handler. #286
|
2019-12-18 07:57:39 +00:00 |
|
|
|
51850d0230
|
Add one step job order process form #270
|
2019-12-18 04:06:45 +08:00 |
|
Korina Cordero
|
0d3a96e038
|
Move updating of warranty to handler. #286
|
2019-12-17 01:05:55 +00:00 |
|
|
|
2f3e8df6d4
|
Fix dashboard map bug when rider has no assigned hub #270
|
2019-12-16 20:25:15 +08:00 |
|
Korina Cordero
|
a02c364c1f
|
Fix testing issues with command. #286
|
2019-12-16 09:58:40 +00:00 |
|
Korina Cordero
|
7da009f673
|
Move getWarrantyPeriod into the WarrantyHandler. #286
|
2019-12-16 09:49:48 +00:00 |
|
Korina Cordero
|
bd2ea5fba3
|
Add the WarrantyHandler service. Move the computeDateExpire to the service. #286
|
2019-12-16 07:29:25 +00:00 |
|
Korina Cordero
|
d04a6976f2
|
Use OpenStreetMap for map in incoming form. #270
|
2019-12-05 07:40:52 +00:00 |
|
Korina Cordero
|
ade2c3b5de
|
Add map manager interface. #270
|
2019-12-03 09:42:23 +00:00 |
|
Korina Cordero
|
1533987727
|
Add a TODO for the JobHandlerInterface. #270
|
2019-11-14 05:56:45 +00:00 |
|
Korina Cordero
|
4549e124eb
|
Add job order queueing for riders assignments. #270
|
2019-11-14 05:54:37 +00:00 |
|
Korina Cordero
|
174f0142c9
|
Move getCustomerVehicleInfo to the customer handler service. #270
|
2019-11-13 02:14:46 +00:00 |
|
Korina Cordero
|
8f875f1e31
|
Move getCustomerVehicles to the customer handler service. #270
|
2019-11-13 01:53:48 +00:00 |
|
Korina Cordero
|
cc3db5b58c
|
Move the delete customer to the service. #270
|
2019-11-12 07:48:35 +00:00 |
|
Korina Cordero
|
fb6823d25c
|
Move the customer list to the customer handler service. #270
|
2019-11-12 07:25:56 +00:00 |
|
Korina Cordero
|
3a33a16cc5
|
Move the loading of customer list page to the customer service. #270
|
2019-11-12 06:41:16 +00:00 |
|
Korina Cordero
|
50e54f6acc
|
Move the update of customer and customer vehicle to customer handler service. #270
|
2019-11-12 05:57:47 +00:00 |
|
Korina Cordero
|
d385d32d2e
|
Move the adding of customer and customer vehicle to customer handler service. #270
|
2019-11-12 03:58:51 +00:00 |
|
Korina Cordero
|
341db63735
|
Create a twig template for job order for resq, separate from cmb. #270
|
2019-11-11 04:52:32 +00:00 |
|
Korina Cordero
|
29cc7374cc
|
Add custom trade in types, warranty class, and modes of payment. #270
|
2019-10-29 04:54:51 +00:00 |
|
Korina Cordero
|
f6dce241ac
|
Move retrieval of env variable to the geofence service. #271
|
2019-10-23 05:30:12 +00:00 |
|
Korina Cordero
|
26d2dab6d8
|
Remove warranty creation when service type is battery replacement under warranty. #270
|
2019-10-18 07:07:16 +00:00 |
|
Korina Cordero
|
e7584b103c
|
Add warranty creation after a job order is fulfilled. #270
|
2019-10-16 06:53:13 +00:00 |
|
Korina Cordero
|
c2fbb75a69
|
Change Delivery Instructions label to Delivery Instructions - CarFix Job Order No. #270
|
2019-10-15 05:24:13 +00:00 |
|
Korina Cordero
|
c6b31569a6
|
Create service types for CMB. #270
|
2019-10-13 09:49:09 +00:00 |
|
Korina Cordero
|
610bbdcc7c
|
Add trade in type for cmb. #270
|
2019-10-09 06:35:11 +00:00 |
|
Korina Cordero
|
a9ed02b0b2
|
Limit the service types to 2 for POC. Have job order return which twig template to display. #270
|
2019-10-07 07:16:03 +00:00 |
|
Korina Cordero
|
eb0e19d27f
|
Add country code prefix to messages. Made the country code a constant. #270
|
2019-10-04 02:36:36 +00:00 |
|
Korina Cordero
|
f205f04b48
|
Move the invoice generation out of the job order service and into the invoice generator service. #270
|
2019-10-02 01:47:57 +00:00 |
|
Korina Cordero
|
08bd23fe30
|
Fix issue of invalid meta urls. #270
|
2019-10-01 10:12:25 +00:00 |
|
Korina Cordero
|
7989f6b6d6
|
Move retrieval of job order rows to the job service. #270
|
2019-10-01 08:35:55 +00:00 |
|
Korina Cordero
|
2f555483be
|
Move generate PDF form to the job order service. #270
|
2019-10-01 07:14:51 +00:00 |
|
Korina Cordero
|
7de72e2ca3
|
Move unlock processor and unlock assignor to the job order service. #270
|
2019-10-01 06:27:55 +00:00 |
|
Korina Cordero
|
304ef3274c
|
Move reject hub to the job order service. #270
|
2019-10-01 05:48:20 +00:00 |
|
Korina Cordero
|
e6482d44f0
|
Move reassignment of hub and rider to the job order service. #270
|
2019-10-01 04:22:49 +00:00 |
|
Korina Cordero
|
12555f3452
|
Move the initialization of rider and hub forms and hub reassignment to the job order service. #270
|
2019-10-01 02:04:16 +00:00 |
|
Korina Cordero
|
a7b5341f0d
|
Move the initialization of the fulfillment and hub forms to the service. #270
|
2019-09-30 08:55:35 +00:00 |
|
Korina Cordero
|
365b316dba
|
Add exception handling to the job order service. #270
|
2019-09-30 08:24:59 +00:00 |
|
Korina Cordero
|
2e2f43152c
|
Move the initialization of parameters for view all and processing job order forms to the service. #270
|
2019-09-30 07:09:10 +00:00 |
|
Korina Cordero
|
34dc619392
|
Move the initialization of parameters for new and edit job order forms to the service. #270
|
2019-09-30 06:28:13 +00:00 |
|
Korina Cordero
|
7754ddc594
|
Move the assign rider, dispatch, fulfill, and cancel job order code to the service. #270
|
2019-09-30 05:26:50 +00:00 |
|
Korina Cordero
|
bd8696311c
|
Move the dispatch and assign rider to job order to the service. #270
|
2019-09-27 09:59:55 +00:00 |
|
Korina Cordero
|
37c0945db9
|
Move the validation for incoming and editing job orders from the controller to the service. #270
|
2019-09-27 06:56:17 +00:00 |
|
Korina Cordero
|
6e3be9edc8
|
Rename from Cmb to CMB. #265
|
2019-09-26 06:57:01 +00:00 |
|
Korina Cordero
|
98a6bfc8ae
|
Create invoice and job generator for cmb. Modify services.yaml for cmb. #265
|
2019-09-25 05:45:40 +00:00 |
|
Korina Cordero
|
f766965f81
|
Add checking for invoice change. #265
|
2019-09-25 03:52:14 +00:00 |
|
Korina Cordero
|
b129609d53
|
Refactor submission of updated job order. #265
|
2019-09-25 02:20:16 +00:00 |
|
Korina Cordero
|
ca97897a2a
|
Move the saving of new job order to a job order generator service. #265
|
2019-09-24 06:58:55 +00:00 |
|
Korina Cordero
|
cf8c3bb8e1
|
Move setting of invoice status and createdby inside the invoice generator. #265
|
2019-09-20 09:53:49 +00:00 |
|
Korina Cordero
|
89ec286a9f
|
Rename processCriteria to generateInvoice. Added constants to invoice generator. #265
|
2019-09-20 09:30:08 +00:00 |
|
Korina Cordero
|
dc2eecbe0c
|
Rename InvoiceCreator to InvoiceGenerator. #265
|
2019-09-20 06:38:52 +00:00 |
|
Korina Cordero
|
cce4638c78
|
Rename invoice creator for resq. Make most public methods in invoice creator protected. #265
|
2019-09-20 06:09:17 +00:00 |
|
Korina Cordero
|
f1cc1dfae1
|
Create interface for invoice creator. #265
|
2019-09-19 07:28:48 +00:00 |
|
Korina Cordero
|
0f6229405e
|
Use getClientOriginalExtension() for the file extensions for file upload. #220
|
2019-06-04 00:42:58 +00:00 |
|
|
|
81ab6db063
|
Merge branch '196-new-apn-sender' into 'master'
Replace apns sender with new one #196
Closes #196
See merge request jankstudio/resq!254
|
2019-05-28 09:53:21 +00:00 |
|
Korina Cordero
|
89cb5ac27e
|
Modify to use the redis client provider to connect to redis. #216
|
2019-05-28 04:47:35 +00:00 |
|
|
|
740110b42f
|
Merge branch '180-rider-location-caching' into 'master'
Resolve "Rider location caching"
Closes #180
See merge request jankstudio/resq!252
|
2019-05-28 03:24:22 +00:00 |
|
|
|
e6239eb053
|
Merge branch '204-set-customer-vehicle-current-battery' into 'master'
Resolve "Set customer vehicle current battery"
Closes #204
See merge request jankstudio/resq!238
|
2019-05-27 02:06:46 +00:00 |
|
Korina Cordero
|
1a3263a428
|
Use redis client provider to connect to redis. #206
|
2019-05-14 09:16:15 +00:00 |
|
Korina Cordero
|
161601ece5
|
Remove the cert file parameter for the redis client. #206
|
2019-05-06 01:25:04 +00:00 |
|
Korina Cordero
|
a166a5f09a
|
Add support for connecting to redis with an ssl file and password. #206
|
2019-05-03 07:15:43 +00:00 |
|
Korina Cordero
|
afc07e7c68
|
Add service to connect to redis. Add command to test service with the HubCounter service. #206
|
2019-05-02 07:21:49 +00:00 |
|
Korina Cordero
|
e61d77ad8b
|
Remove checking for rider validity. Add call to RiderTracker service from the APIController. #180
|
2019-04-29 02:16:03 +00:00 |
|
Korina Cordero
|
76b1f07feb
|
Create rider tracker service. Create a test command to test rider tracker service. #180
|
2019-04-23 11:02:40 +00:00 |
|
Korina Cordero
|
4e711ca2c3
|
Rename the service to JobOrderManager. #204
|
2019-04-22 06:04:22 +00:00 |
|
Korina Cordero
|
fd6e617f95
|
Add a service that sets the job order as fulfilled and sets the current battery of the customer vehicle to the battery that was purchased. Create a command that tests the service. #204
|
2019-04-12 07:39:21 +00:00 |
|
|
|
d7a2e7f899
|
Replace apns sender with new one #196
|
2019-03-28 11:22:28 +08:00 |
|
Korina Cordero
|
fc94bfbef1
|
Set a maximum number of results for the query. Fix the issue of the search word not sent to the controller. #182
|
2019-03-14 07:31:44 -04:00 |
|
Korina Cordero
|
34c22b01e2
|
Add getters and setters for LegacyJobOrder. Create service that searches for plate number, name, and phone numbers in the legacy job orders, current job orders, and warranty. Create test command to test the search service. #182
|
2019-03-12 05:30:10 -04:00 |
|
|
|
2ffc856b10
|
Add GeofenceTracker service and test command #141
|
2019-03-10 22:33:35 +08:00 |
|
|
|
d24be90314
|
Refactor import kml to handle multiple polygons #141
|
2019-03-10 19:47:33 +08:00 |
|
Korina Cordero
|
f93b675976
|
Use EntityManagerInterface instead of ObjectManager for ORM
|
2019-03-07 02:37:14 -05:00 |
|
Korina Cordero
|
5def677267
|
Create command that takes a kml file as an argument. Fix errors with the SupportedArea entity file and the KMLImporter service.
|
2019-03-06 19:52:05 -05:00 |
|
Korina Cordero
|
84eb00f9e5
|
Create function to retrieve the enclosed area from a KML file
|
2019-03-05 03:28:51 -05:00 |
|
|
|
2f32f9666d
|
Adjust computation for services #167
|
2018-11-06 15:14:22 +08:00 |
|
|
|
28db60e92d
|
Remove google maps distance and eta calculations #165
|
2018-10-18 21:39:39 +08:00 |
|
|
|
9ca197f33f
|
Fix assitance spelling #162
|
2018-09-07 21:29:09 +08:00 |
|
|
|
3ad32605fe
|
Add support for coolant and non-coolant overheat service #162
|
2018-09-07 03:27:56 +08:00 |
|
root
|
e7fd6cb9d1
|
Fix battery image issue for under warranty
|
2018-09-02 23:19:03 +08:00 |
|
|
|
63a3136d77
|
Have invoice creator recognize motolite batteries in vehicles and give free services for them
|
2018-08-20 04:01:38 +08:00 |
|
|
|
317ac19c52
|
Only allow ios push messages to go through APNS client service #162
|
2018-08-17 03:34:46 +08:00 |
|
|
|
30e08259db
|
Add apple push notification service #162
|
2018-08-15 15:09:04 +08:00 |
|
|
|
4bb2374d66
|
Make sure we only send to unique channels when sending user app events #162
|
2018-08-15 09:14:18 +08:00 |
|
|
|
2fe3448e8f
|
Change pricing for tire repair service #161
|
2018-07-27 00:43:02 +08:00 |
|
|
|
397f3d144a
|
Update prices for refuel and overheat services #161
|
2018-07-27 00:24:10 +08:00 |
|
root
|
b7bb0cdaf9
|
Fix MQTT to Redis to python backend
|
2018-07-19 11:54:05 +08:00 |
|
|
|
2a1f0977c7
|
Add debug data for mqtt sending to user app #159
|
2018-07-19 10:03:37 +08:00 |
|
|
|
550d1e1e02
|
Modify MQTTClient service to support tls certs #154
|
2018-07-06 23:46:02 +08:00 |
|
|
|
cbdc2fd24e
|
Add sendRiderEvent call for MQTTClient service #151
|
2018-07-02 00:22:15 +08:00 |
|
|
|
3c552b6c82
|
Merge branch '133-fix-alerts-for-ios-app-from-rider-app-initiated-events' into 'master'
Resolve "Fix alerts for ios app from rider app initiated events"
Closes #133
See merge request jankstudio/resq!130
|
2018-06-05 20:25:09 +00:00 |
|
|
|
352ca77130
|
Add debug info for mqtt client #133
|
2018-06-06 04:24:30 +08:00 |
|
|
|
499bc1cd3c
|
Add more debug information for fuel service #135
|
2018-06-04 08:11:52 +08:00 |
|
|
|
3bfc8c5c5b
|
Add debug info for refuel #135
|
2018-06-04 07:59:35 +08:00 |
|
|
|
8b5141385c
|
Add customer vehicle to invoice criteria #135
|
2018-06-04 07:48:29 +08:00 |
|
|
|
f4d4a6e3a0
|
Add mqttclient service to send mqtt events #133
|
2018-06-04 03:28:37 +08:00 |
|
|
|
e93fec2811
|
Merge branch 'master' into 111-sms-feature-for-security-code
Conflicts:
src/Controller/APIController.php
|
2018-05-25 10:42:13 +08:00 |
|
|
|
955f0e4d46
|
Add rising tide sms service #111
|
2018-05-25 01:36:34 +08:00 |
|
|
|
7f7707d827
|
Force ipv4 resolv for calls to google maps api #113
|
2018-05-07 22:57:42 +08:00 |
|
|
|
4652a82fff
|
Support new services #110
|
2018-05-02 21:12:49 +08:00 |
|
|
|
757ec209ad
|
Fix OPL formula in discount calculation #96
|
2018-04-19 11:00:33 +08:00 |
|
|
|
5b5fbd7555
|
Add general service - under warranty service type #88
|
2018-04-09 22:30:00 +08:00 |
|
|
|
af6765f662
|
Add post replacement and recharge in invoice creator #80
|
2018-04-09 02:00:37 +08:00 |
|
|
|
803410fb8c
|
Fix bug for under warranty job order #74
|
2018-04-06 04:48:44 +08:00 |
|
|
|
c5fe392cae
|
Modify invoice creator to properly compute for trade-ins based on size #70
|
2018-04-04 21:23:26 +08:00 |
|
|
|
cc132288f8
|
Add trade-in categories #66
|
2018-04-03 11:31:11 +08:00 |
|
|
|
9ad5f2557b
|
Implement counters and fix rider flow #UAT
|
2018-03-12 18:32:59 +08:00 |
|
|
|
1dd51a8dd3
|
Add support for invoice generation for under warranty #29
|
2018-02-28 01:42:09 +08:00 |
|
Ramon Gutierrez
|
e124b0cebd
|
Fix job order form to use hubs instead of outlets #17
|
2018-02-19 14:11:56 +08:00 |
|
Ramon Gutierrez
|
d4cc431bac
|
Associate job orders with hubs instead of outlets, filter assigning list to user assigned hubs only #17
|
2018-02-19 13:51:07 +08:00 |
|
Ramon Gutierrez
|
887823eee0
|
Add invoice display, prevent editing on anything other than incoming tier
|
2018-02-05 13:14:55 +08:00 |
|
|
|
f79aa12fbc
|
Add discount support to invoice generation
|
2018-02-05 01:43:31 +08:00 |
|
|
|
1125eba1bc
|
Merge branch 'master' of gitlab.com:jankstudio/resq
|
2018-02-05 01:24:07 +08:00 |
|
|
|
a3d793087d
|
Fix invoice generation computations
|
2018-02-05 01:23:38 +08:00 |
|
Ramon Gutierrez
|
74b696099c
|
Check if filename exists before proceeding with upload
|
2018-02-04 20:37:04 +08:00 |
|
Ramon Gutierrez
|
92035b99bf
|
Use new invoice generation behavior on job order form
|
2018-02-02 02:31:22 +08:00 |
|
|
|
687f1b0ff9
|
Add more work on InvoiceCreator
|
2018-02-01 23:12:50 +08:00 |
|
|
|
b6ce9d8ad8
|
Fix missing semicolon
|
2018-02-01 03:00:17 +08:00 |
|
|
|
04cd0c59eb
|
Add initial invoice capability
|
2018-02-01 01:35:47 +08:00 |
|
Ramon Gutierrez
|
2b4c289ba9
|
Filter nearest outlets by open and close times
|
2018-01-30 19:47:39 +08:00 |
|
|
|
bcfa77151c
|
Add map for viewing nearby outlets in job order processing
|
2018-01-18 10:07:54 +08:00 |
|
|
|
1f4ae0e386
|
Improve output of map tools
|
2018-01-17 22:51:13 +08:00 |
|
|
|
53e71e1db0
|
Convert distance test into service
|
2018-01-17 18:12:04 +08:00 |
|
Ramon Gutierrez
|
e67e5f3f16
|
Initial commit for rider image upload, add FileUploader service
|
2018-01-16 17:27:43 +08:00 |
|
