Add vendor name

.github/pull-request-template.md

@@ -1,38 +1,29 @@
-### What does this PR do?
-
-Describe the overall purpose of the PR changes. Doesn't need to be as specific as the
-individual commits.
-
-### Helpful background context
-
-Describe any additional context beyond what the PR accomplishes if it is likely to be
-useful to a reviewer.
-
-Delete this section if it isn't applicable to the PR.
+### Purpose and background context
+Describe the overall purpose of the PR changes and any useful background context.
 
 ### How can a reviewer manually see the effects of these changes?
-
 Explain how to see the proposed changes in the application if possible.
 
 Delete this section if it isn't applicable to the PR.
 
 ### Includes new or updated dependencies?
+YES | NO
 
+### Changes expectations for external applications?
 YES | NO
 
 ### What are the relevant tickets?
-
-Include links to Jira Software and/or Jira Service Management tickets here.
+- Include links to Jira Software and/or Jira Service Management tickets here.
 
 ### Developer
-
-- [ ] All new ENV is documented in README (or there is none)
+- [ ] All new ENV is documented in README
+- [ ] All new ENV has been added to staging and production environments
+- [ ] All related Jira tickets are linked in commit message(s)
 - [ ] Stakeholder approval has been confirmed (or is not needed)
 
-### Code Reviewer
-
-- [ ] The commit message is clear and follows our guidelines (not just this pull request message)
+### Code Reviewer(s)
+- [ ] The commit message is clear and follows our guidelines (not just this PR message)
 - [ ] There are appropriate tests covering any new functionality
-- [ ] The documentation has been updated or is unnecessary
-- [ ] The changes have been verified
+- [ ] The provided documentation is sufficient for understanding any new functionality introduced
+- [ ] Any manual tests have been performed and verified
 - [ ] New dependencies are appropriate or there were no changes

ccslips/polines.py

@@ -43,6 +43,7 @@ def extract_credit_card_slip_data(client: AlmaClient, po_line_record: dict) -> d
             f"${get_total_price_from_fund_distribution(fund_distribution, price):.2f}"
         ),
         "vendor_code": po_line_record.get("vendor_account", "No vendor found"),
+        "vendor_name": po_line_record.get("vendor", {}).get("desc", "No vendor found"),
     }
     po_line_data.update(get_account_data(client, fund_distribution))
 

config/credit_card_slip_template.xml

@@ -21,6 +21,12 @@
       <td class="cardholder" align="left"></td>
       <td></td>
     </tr>
+    <tr>
+      <td align="left">Vendor name:
+      </td>
+      <td class="vendor_name" align="left"></td>
+      <td></td>
+    </tr>
     <tr>
       <td align="left">Vendor code:
       </td>

tests/conftest.py

@@ -4,7 +4,7 @@
 import pytest
 import requests_mock
 from click.testing import CliRunner
-from moto import mock_ses
+from moto import mock_aws
 
 from ccslips.alma import AlmaClient
 
@@ -136,7 +136,7 @@ def mocked_alma(fund_records, po_line_records):
 # AWS fixtures
 @pytest.fixture(autouse=True)
 def mocked_ses():
-    with mock_ses():
+    with mock_aws():
         ses = boto3.client("ses", region_name="us-east-1")
         ses.verify_email_identity(EmailAddress="[email protected]")
         yield ses

tests/fixtures/po_line_records.json

@@ -42,7 +42,8 @@
         "resource_metadata": {
             "title": "Book title"
         },
-        "vendor_account": "Corporation"
+        "vendor_account": "CORP",
+        "vendor": {"value": "CORP", "desc": "Corporation"}
     },
     "missing_fields": {
         "acquisition_method": {

tests/test_alma.py

@@ -48,7 +48,8 @@ def test_get_full_po_line(alma_client):
         "number": "POL-all-fields",
         "price": {"sum": "12.0"},
         "resource_metadata": {"title": "Book title"},
-        "vendor_account": "Corporation",
+        "vendor_account": "CORP",
+        "vendor": {"value": "CORP", "desc": "Corporation"},
     }
 
 

tests/test_polines.py

@@ -22,7 +22,8 @@ def test_extract_credit_card_slip_data_all_fields_present(alma_client, po_line_r
         "quantity": "3",
         "item_title": "Book title",
         "total_price": "$12.00",
-        "vendor_code": "Corporation",
+        "vendor_code": "CORP",
+        "vendor_name": "Corporation",
     }
 
 
@@ -40,6 +41,7 @@ def test_extract_credit_card_slip_data_missing_fields(alma_client, po_line_recor
         "item_title": "Unknown title",
         "total_price": "$0.00",
         "vendor_code": "No vendor found",
+        "vendor_name": "No vendor found",
     }
 
 
@@ -184,7 +186,8 @@ def test_generate_credit_card_slips_html_populates_all_fields():
             "quantity": "3",
             "item_title": "Book title",
             "total_price": "$12.00",
-            "vendor_code": "Corporation",
+            "vendor_code": "CORP",
+            "vendor_name": "Corporation",
         }
     ]
     assert (
@@ -212,10 +215,16 @@ def test_generate_credit_card_slips_html_populates_all_fields():
       <td class="cardholder" align="left">cardholder name</td>
       <td />
     </tr>
+    <tr>
+      <td align="left">Vendor name:
+      </td>
+      <td class="vendor_name" align="left">Corporation</td>
+      <td />
+    </tr>
     <tr>
       <td align="left">Vendor code:
       </td>
-      <td class="vendor_code" align="left">Corporation</td>
+      <td class="vendor_code" align="left">CORP</td>
       <td />
     </tr>
     <tr>