|
|
6c3bc652fa
|
Merge branch 'origin/265-cmb-project' into '270-final-cmb-fixes'
Move origin/265 to 270
See merge request jankstudio/resq!317
|
2019-09-27 01:55:33 +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
|
7f973fd10a
|
Merge branch 'master' of gitlab.com:jankstudio/resq into origin/265-cmb-project
|
2019-09-25 02:34:59 +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
|
37a8309943
|
Merge branch '265-cmb-project' of gitlab.com:jankstudio/resq into origin/265-cmb-project
|
2019-09-19 00:41:06 +00:00 |
|
|
|
d205ee0346
|
Merge branch '268-error-when-creating-new-customer-with-a-customer-vehicle' into 'master'
Resolve "Error when creating new customer with a customer vehicle"
Closes #268
See merge request jankstudio/resq!315
|
2019-09-18 04:17:35 +00:00 |
|
Korina Cordero
|
a8cf329f09
|
Fix for error when adding a customer with vehicle. #268
|
2019-09-18 04:12:17 +00:00 |
|
|
|
06a53352fe
|
Merge branch 'origin/265-cmb-project' into 'master'
Origin/265 cmb project
See merge request jankstudio/resq!314
|
2019-09-17 06:49:45 +00:00 |
|
|
|
5b820397cd
|
Merge branch '267-report-of-crm-customers-with-resq-app' into 'master'
Add plate number to report. #267
Closes #267
See merge request jankstudio/resq!312
|
2019-09-17 05:30:12 +00:00 |
|
Korina Cordero
|
74cc496b49
|
Add plate number to report. #267
|
2019-09-17 05:29:04 +00:00 |
|
|
|
5b8bcd852f
|
Merge branch '267-report-of-crm-customers-with-resq-app' into 'master'
Resolve "Report of crm customers with resq app"
Closes #267
See merge request jankstudio/resq!311
|
2019-09-17 04:04:02 +00:00 |
|
Korina Cordero
|
bee8a0d9fe
|
Fix query to get customers for report. #267
|
2019-09-17 03:32:37 +00:00 |
|
Korina Cordero
|
4a50729a41
|
Create command to generate report. #267
|
2019-09-16 15:28:53 +00:00 |
|
Korina Cordero
|
2a81103773
|
Add method and form for the report. #267
|
2019-09-16 10:47:48 +00:00 |
|
Korina Cordero
|
d2cb66d358
|
Add translation file for resq. #265
|
2019-09-16 07:13:24 +00:00 |
|
Korina Cordero
|
df369a1919
|
Add translations for new battery size. #265
|
2019-09-13 06:31:25 +00:00 |
|
Korina Cordero
|
0fadccc16c
|
Add translations for the job order in pdf form. #265
|
2019-09-13 06:14:18 +00:00 |
|
Korina Cordero
|
da0fde37ef
|
Add translations for text with the battery brand. #265
|
2019-09-13 05:53:42 +00:00 |
|
Korina Cordero
|
de95af5054
|
Add translations for the title for the login page and app. #265
|
2019-09-13 03:56:40 +00:00 |
|
Korina Cordero
|
1b6ac066eb
|
Add translations for icons, logo, and footer. #265
|
2019-09-13 03:22:25 +00:00 |
|
Korina Cordero
|
fc1989c3d0
|
Change the logo to the login page. #265
|
2019-09-12 08:44:25 +00:00 |
|
Korina Cordero
|
c3feef4644
|
Add translation package to project. #265
|
2019-09-11 06:49:01 +00:00 |
|
|
|
d8aa28d751
|
Merge branch '263-capi-command-to-return-privacy-policy-contents' into 'master'
Resolve "CAPI command to return privacy policy contents"
Closes #263
See merge request jankstudio/resq!310
|
2019-09-06 07:24:38 +00:00 |
|
Korina Cordero
|
f1f6db475c
|
Fix issue where user cannot update policy contents. #263
|
2019-09-06 07:17:39 +00:00 |
|
Korina Cordero
|
417bd3c0e1
|
Add getPrivacyPolicy to third party API. #263
|
2019-09-06 07:10:54 +00:00 |
|
|
|
47e098be1c
|
Merge branch '262-fix-privacy-policy-bug' into 'master'
Increase rows for policy content to 50. #262
Closes #262
See merge request jankstudio/resq!309
|
2019-09-06 00:53:25 +00:00 |
|
Korina Cordero
|
18376f5a58
|
Increase rows for policy content to 50. #262
|
2019-09-05 09:42:51 +00:00 |
|
|
|
b1ab6e5df2
|
Merge branch '260-privacy-policy-ui' into 'master'
Resolve "Privacy policy UI"
Closes #260
See merge request jankstudio/resq!307
|
2019-08-30 03:56:22 +00:00 |
|
Korina Cordero
|
237dd7aa93
|
Added Assert\Not Blank() for the name of policy. #260
|
2019-08-30 03:12:58 +00:00 |
|
Korina Cordero
|
a71b1a36fd
|
Merge branch '261-no-access-when-setting-privacy-policy' into 'master'
Resolve "No access when setting privacy policy"
Closes #261
See merge request jankstudio/resq!306
|
2019-08-30 02:13:34 +00:00 |
|
Korina Cordero
|
e0294062ca
|
Add access rights for setting privacy policy. Add privacy policy field to Warranty, along with setter and getter. #261
|
2019-08-30 02:12:01 +00:00 |
|
|
|
4f95933742
|
Merge branch '256-privacy-policy-for-warranty' into 'master'
Resolve "Privacy policy for warranty"
Closes #256
See merge request jankstudio/resq!304
|
2019-08-30 01:53:34 +00:00 |
|
Korina Cordero
|
4bc99df261
|
Merge branch 'master' into '256-privacy-policy-for-warranty'
# Conflicts:
# src/Entity/PrivacyPolicy.php
|
2019-08-28 03:12:37 +00:00 |
|
Korina Cordero
|
da4f694c03
|
Add setPrivacyPolicy to WarrantyController for third party API. Add route to third party api yaml. Add comment to APIController and WarrantyController indicating whether third party API or mobile API. Modify checking for required parameters, instead of using empty() to use isset()). #256
|
2019-08-28 03:10:19 +00:00 |
|
Korina Cordero
|
b7c5bad80b
|
Merge branch '256-privacy-policy-for-warranty' of gitlab.com:jankstudio/resq into 256-privacy-policy-for-warranty
|
2019-08-28 02:27:21 +00:00 |
|
Korina Cordero
|
918f95e425
|
Modify the association between Warranty and PrivacyPolicy to ManyToOne. Add getters and setters for warranty in PrivacyPolicy. #256
|
2019-08-28 02:15:26 +00:00 |
|
|
|
c204fccc81
|
Merge branch 'revert-8d19f6e9' into 'master'
Revert "Merge branch '256-privacy-policy-for-warranty' into 'master'"
See merge request jankstudio/resq!303
|
2019-08-28 02:10:36 +00:00 |
|
Korina Cordero
|
96bd2684b1
|
Revert "Merge branch '256-privacy-policy-for-warranty' into 'master'"
This reverts merge request !302
|
2019-08-28 01:56:01 +00:00 |
|
|
|
8d19f6e9b9
|
Merge branch '256-privacy-policy-for-warranty' into 'master'
Resolve "Privacy policy for warranty"
Closes #256
See merge request jankstudio/resq!302
|
2019-08-28 01:38:14 +00:00 |
|
Korina Cordero
|
b8504c3701
|
Modify the assocation between PrivacyPolicy and Warranty to ManyToOne. #256
|
2019-08-28 00:32:48 +00:00 |
|
Korina Cordero
|
ff1e634cdc
|
Remove error_log line from setPrivacyPolicy method. #256
|
2019-08-27 08:05:34 +00:00 |
|
Korina Cordero
|
9efc347a7f
|
Add setPrivacyPolicy method to APIController. Add route and acl for setting of privacy policy for warranty. Allow null to be set for setPrivacyPolicy in Warranty entity. Modify the checking for missing parameters, from empty to isset. #256
|
2019-08-27 07:49:10 +00:00 |
|
