Commit graph

1169 commits

Author SHA1 Message Date
4d0c0345fb Merge branch '249-add-export-to-csv-button-for-popapp-report' into 'master'
Resolve "Add export to csv button for popapp report"

Closes #249

See merge request jankstudio/resq!294
2019-08-16 02:27:09 +00:00
Korina Cordero
a36e9f810b Comment out the displaying of report details. #249 2019-08-15 06:15:53 +00:00
Korina Cordero
498b61be48 Add export to CSV button. Add method to controller that uploads a csv file and outputs a csv report of the results. #249 2019-08-15 05:52:29 +00:00
Korina Cordero
74e1e329a7 Merge branch '248-generate-popapp-report' into 'master'
Resolve "Generate popapp report"

Closes #248

See merge request jankstudio/resq!293
2019-08-09 08:02:02 +00:00
Korina Cordero
c11393b69e Add Activation Status column to report. #248 2019-08-09 08:01:23 +00:00
Korina Cordero
ec17cd4c77 Modify 'Has Mobile?' to 'Has Mobile App?'. #248 2019-08-09 07:46:37 +00:00
Korina Cordero
99f0a9cf44 Display customer and warranty information for serials from the uploaded CSV file. #248 2019-08-09 07:42:18 +00:00
Korina Cordero
10d9800bda Add static class to check if plate number is valid. #248 2019-08-09 07:40:32 +00:00
Korina Cordero
a5e6a632f4 Add upload of csv file to ReportController. Add templates for upload. #248 2019-08-08 08:33:20 +00:00
Korina Cordero
c695a1f9b2 Add popapp comparison report link to Reports. Add route and access to report. #248 2019-08-08 04:17:58 +00:00
01a1fe4a9a Merge branch 'revert-4d06e17f' into 'master'
Revert "Merge branch '247-warranty-data-fixes-for-android' into 'master'"

See merge request jankstudio/resq!292
2019-08-07 17:21:02 +00:00
a703cbf2bf Revert "Merge branch '247-warranty-data-fixes-for-android' into 'master'"
This reverts merge request !291
2019-08-07 17:20:48 +00:00
4d06e17fc7 Merge branch '247-warranty-data-fixes-for-android' into 'master'
Add null checks and set to '' for json data #247

Closes #247

See merge request jankstudio/resq!291
2019-08-07 14:38:02 +00:00
e3bca2c07d Add null checks and set to '' for json data #247 2019-08-07 22:37:08 +08:00
Korina Cordero
c78473ed6e Merge branch '246-fix-otp-generator' into 'master'
Resolve "Fix otp generator"

Closes #246

See merge request jankstudio/resq!290
2019-08-07 08:24:50 +00:00
Korina Cordero
e0bcfefead Fix if statement for the phone number. #246 2019-08-07 08:24:09 +00:00
3df29fc842 Add special number for app store testing #246 2019-08-07 16:06:10 +08:00
Korina Cordero
de0272222d Merge branch '245-remove-time-element-from-purchase-date' into 'master'
Resolve "Remove time element from purchase date"

Closes #245

See merge request jankstudio/resq!289
2019-08-07 05:57:18 +00:00
Korina Cordero
bccbeda83a Remove the time element from date purchase, date expiry, and date claim. #245 2019-08-07 05:55:52 +00:00
Korina Cordero
7cdd43ac99 Merge branch '244-display-mobile-number-instead-of-id-in-the-reviews' into 'master'
Resolve "Display mobile number instead of ID in the Reviews"

Closes #244

See merge request jankstudio/resq!288
2019-08-07 05:42:44 +00:00
Korina Cordero
871609fe5d Change display of mobile session id to mobile phone number when listing reviews and when viewing review details. #244 2019-08-07 05:41:40 +00:00
a28eb94b13 Merge branch 'revert-45026766' into 'master'
Revert "Merge branch '243-limit-nearest-partner-api-call-to-5' into 'master'"

See merge request jankstudio/resq!287
2019-08-05 15:29:03 +00:00
a0c8f01c4b Revert "Merge branch '243-limit-nearest-partner-api-call-to-5' into 'master'"
This reverts merge request !286
2019-08-05 15:28:53 +00:00
450267669f Merge branch '243-limit-nearest-partner-api-call-to-5' into 'master'
Hardcode limit of 5 to getting nearest partners API call #243

Closes #243

See merge request jankstudio/resq!286
2019-08-05 09:42:04 +00:00
2e95ac301e Hardcode limit of 5 to getting nearest partners API call #243 2019-08-05 17:41:20 +08:00
a1ad5457ac Merge branch '242-migration-script-for-other-services-providers-2' into 'master'
Resolve "Migration script for other services providers"

Closes #242

See merge request jankstudio/resq!285
2019-08-05 05:22:36 +00:00
Korina Cordero
b794b2e622 Remove the Assert\NotBlank from branch in Location. Add command to import partners given a csv file. #242 2019-08-05 04:14:35 +00:00
Korina Cordero
93e483065c Merge branch '241-undefined-variable-average_rating-when-getting-partner-with-no-reviews' into 'master'
Resolve "Undefined variable: average_rating when getting partner with no reviews"

Closes #241

See merge request jankstudio/resq!284
2019-08-02 02:32:13 +00:00
Korina Cordero
cb6899bfe8 Fix for undefined variable bug. Declare average_rating outside if statement. #241 2019-08-02 02:30:55 +00:00
Korina Cordero
195ab31a5e Merge branch '240-cannot-create-new-customer' into 'master'
Resolve "Cannot create new customer"

Closes #240

See merge request jankstudio/resq!283
2019-08-01 04:19:22 +00:00
Korina Cordero
db53630fc5 Remove Assert annotation for the privacy policy for customer. #240 2019-08-01 04:18:45 +00:00
Korina Cordero
8776ff1397 Merge branch '239-modify-query-for-updateinfo-in-apicontroller' into 'master'
Resolve "Modify query for updateInfo in APIController"

Closes #239

See merge request jankstudio/resq!282
2019-07-31 07:18:54 +00:00
Korina Cordero
580f79b6ef Fix the query for mobile policy in updateInfo. #239 2019-07-31 07:17:45 +00:00
Korina Cordero
bf0cf17962 Merge branch '238-activate-all-warranties-for-the-same-plate-number' into 'master'
Resolve "Activate all warranties for the same plate number"

Closes #238

See merge request jankstudio/resq!281
2019-07-31 02:27:21 +00:00
Korina Cordero
6655869c4f Activate all warranties found for a plate number. #238 2019-07-31 02:19:46 +00:00
Korina Cordero
74740f6228 Merge branch '236-add-warranty-to-admin-panel' into 'master'
Resolve "Add warranty to admin panel"

Closes #236

See merge request jankstudio/resq!277
2019-07-30 06:35:58 +00:00
Korina Cordero
9c2fd4ed3a Add default value for purchase date. Default for date expiry and date claim is empty. #236 2019-07-30 06:33:40 +00:00
Korina Cordero
ad27ec3cf2 Add update warranty. #236 2019-07-30 06:20:16 +00:00
da680d9781 Merge branch '237-add-otp_mode-in-env' into 'master'
Add checking for otp mode for sending of confirmation code. #237

Closes #237

See merge request jankstudio/resq!279
2019-07-30 04:53:59 +00:00
Korina Cordero
31dd5c4cf2 Add checking for otp mode for sending of confirmation code. #237 2019-07-30 03:55:50 +00:00
Korina Cordero
978735adbd Fix error for add warranty. #236 2019-07-30 03:39:32 +00:00
Korina Cordero
2e022c893c Add form for warranty submission. #236 2019-07-29 08:32:48 +00:00
Korina Cordero
08247f30f6 Merge branch 'master' of gitlab.com:jankstudio/resq into 236-add-warranty-to-admin-panel 2019-07-29 05:37:50 +00:00
Korina Cordero
5db6c7f2d2 Merge branch '237-add-otp_mode-in-env' into 'master'
Resolve "Add otp_mode in .env"

Closes #237

See merge request jankstudio/resq!278
2019-07-29 05:37:14 +00:00
Korina Cordero
a18654b0d1 Add OTP_MODE variable to .env.dist. Modify checking for the confirmCode to set, depending on the value of OTP_MODE. #237 2019-07-29 05:33:12 +00:00
Korina Cordero
2deea2ea8e Add form to add/update warranty. #236 2019-07-29 04:38:00 +00:00
Korina Cordero
2d1a91842a Rename the old Warranty controller to WarrantySearchController. Rename the old warranty.yaml to warranty_search.yaml. Add create, update, and view warranty to menu and acl yamls. Add WarrantyController and template file for Warranty. #236 2019-07-26 08:21:00 +00:00
Korina Cordero
85844aae3a Merge branch '235-create-env-variables-for-privacy-policy-ids' into 'master'
Resolve "Create .env variables for privacy policy ids"

Closes #235

See merge request jankstudio/resq!276
2019-07-25 03:20:23 +00:00
Korina Cordero
3c460b86c9 Use the env vars for the policy in the command. Improve the queries for privacy policy. #235 2019-07-25 03:19:20 +00:00
Korina Cordero
c8cb0baec0 Merge branch '233-privacy-policy-fixes' into 'master'
Add policy ids to the .env.dist file. Modify the query to get policy in the APIController. #233

Closes #233

See merge request jankstudio/resq!275
2019-07-25 00:43:32 +00:00