Updated Email Address (#1789)

* update to 1.6.25

* Changed compliance report dropdown to include next year. Updated about this form section (#1778)

* Added renewable naptha as a fuel code (#1779)

* update to 1.6.25

* Renewable requirements (#1780)

* Included natural gas as part of line 1. Renewable percentage is now taken into account for line 1 and line 12

* Changes to how petroleum diesel volume and petroleum gas volume is counted for renewable percentage types

* Fixed an issue where some fuels are not showing up in LINE 1

* Fixed Renewable Tooltip (#1781)

* Forgot to save and commit this file

* Added restrictions for the fuels so its based on the compliance period of the report

* ESLint Fix

* Changed default email. Updated the manual

Co-authored-by: Kuan Fan <31664961+kuanfandevops@users.noreply.github.com>

backend/api/services/ComplianceReportSpreadSheet.py

@@ -1,7 +1,9 @@
+import xlwt
+
 from collections import namedtuple, defaultdict
 from decimal import Decimal
 
-import xlwt
+from api.models.FuelCode import FuelCode
 
 
 class ComplianceReportSpreadsheet(object):
@@ -114,7 +116,15 @@ def add_schedule_b(self, schedule_b):
             worksheet.write(row_index, 1, record['fuel_class'])
             worksheet.write(row_index, 2, record['provision_of_the_act'])
             if record['fuel_code'] is not None:
-                worksheet.write(row_index, 3, record['fuel_code'])
+                fuel_code_id = record['fuel_code']
+                fuel_code = FuelCode.objects.filter(id=fuel_code_id).first()
+                if fuel_code:
+                    fuel_code_string = fuel_code.fuel_code + \
+                        str(fuel_code.fuel_code_version) + '.' + \
+                        str(fuel_code.fuel_code_version_minor)
+                    worksheet.write(row_index, 3, fuel_code_string)
+                else:
+                    worksheet.write(row_index, 3, record['fuel_code'])
             else:
                 if record['schedule_d_sheet_index'] is not None:
                     worksheet.write(row_index, 3, 'From Schedule D')

frontend/__tests__/app/components/__snapshots__/StatusInterceptor.js.snap

@@ -14,7 +14,7 @@ exports[`StatusInterceptor should display the proper message for 401 errors 1`]
   <p>
     You will need to
     <a
-      href="mailto:lcfrr@gov.bc.ca?subject=Account%20Setup%20for%20TFRS"
+      href="mailto:lcfs@gov.bc.ca?subject=Account%20Setup%20for%20TFRS"
     >
        contact us 
     </a>
@@ -37,7 +37,7 @@ exports[`StatusInterceptor should display the proper message for 403 errors 1`]
   <p>
     You will need to
     <a
-      href="mailto:lcfrr@gov.bc.ca?subject=Account%20Setup%20for%20TFRS"
+      href="mailto:lcfs@gov.bc.ca?subject=Account%20Setup%20for%20TFRS"
     >
        contact us 
     </a>

frontend/src/app/components/StatusInterceptor.js

@@ -10,7 +10,7 @@ class StatusInterceptor extends Component {
           a page that you do not have permissions to see.
         </p>
         <p>You will need to
-          <a href="mailto:lcfrr@gov.bc.ca?subject=Account%20Setup%20for%20TFRS"> contact us </a>
+          <a href="mailto:lcfs@gov.bc.ca?subject=Account%20Setup%20for%20TFRS"> contact us </a>
           for help.
         </p>
       </div>
@@ -25,7 +25,7 @@ class StatusInterceptor extends Component {
           a page that you do not have permissions to see.
         </p>
         <p>You will need to
-          <a href="mailto:lcfrr@gov.bc.ca?subject=Account%20Setup%20for%20TFRS"> contact us </a>
+          <a href="mailto:lcfs@gov.bc.ca?subject=Account%20Setup%20for%20TFRS"> contact us </a>
           for help.
         </p>
       </div>

frontend/src/compliance_reporting/components/ComplianceReportIntro.js

@@ -42,7 +42,7 @@ const ComplianceReportIntro = (props) => {
         <p>
         An administrative penalty must be made payable to the Minister of Finance. Payment is due
         March 31 following each compliance period. For more information please contact the Low
-        Carbon Fuels Branch via email at <a href="mailto:lcfrr@gov.bc.ca">lcfrr@gov.bc.ca</a>.
+        Carbon Fuels Branch via email at <a href="mailto:lcfs@gov.bc.ca">lcfs@gov.bc.ca</a>.
         </p>
 
         <h3>Small  Fuel Supplier Exemption</h3>
@@ -75,7 +75,7 @@ const ComplianceReportIntro = (props) => {
 
         <h3>Questions?</h3>
         <p>
-        Please contact <a href="mailto:lcfrr@gov.bc.ca">lcfrr@gov.bc.ca</a> with any questions you
+        Please contact <a href="mailto:lcfs@gov.bc.ca">lcfs@gov.bc.ca</a> with any questions you
         may have about this form.
         </p>
       </div>

frontend/src/contact_us/components/ContactUsPage.js

@@ -5,7 +5,7 @@ const ContactUsPage = props => (
     <h1>Contact Us</h1>
     <h3>Need help with TFRS?</h3>
     <p>
-      Contact the Low Carbon Fuels Branch at <a href="mailto:lcfrr@gov.bc.ca">lcfrr@gov.bc.ca</a>
+      Contact the Low Carbon Fuels Branch at <a href="mailto:lcfs@gov.bc.ca">lcfs@gov.bc.ca</a>
     </p>
     <h3>Need help with BCeID?</h3>
     <p>

frontend/src/dashboard/components/Feedback.js

@@ -9,11 +9,11 @@ const Feedback = props => (
       We are always striving to improve TFRS. <br />
       {` Please send your suggestions and feedback to `}
       <a
-        href="mailto:lcfrr@gov.bc.ca"
+        href="mailto:lcfs@gov.bc.ca"
         rel="noopener noreferrer"
         target="_blank"
       >
-        lcfrr@gov.bc.ca
+        lcfs@gov.bc.ca
       </a>
     </p>
   </div>

frontend/src/exclusion_reports/components/ExclusionReportIntro.js

@@ -33,7 +33,7 @@ const ExclusionReportIntro = (props) => {
 
         <h3>Questions?</h3>
         <p>
-        Please contact <a href="mailto:lcfrr@gov.bc.ca">lcfrr@gov.bc.ca</a> with any questions you
+        Please contact <a href="mailto:lcfs@gov.bc.ca">lcfs@gov.bc.ca</a> with any questions you
         may have about this form.
         </p>
       </div>