Merge branch 'master' into max-retry-payment

apps/sage_intacct/models.py

@@ -326,6 +326,21 @@ def get_memo(expense_group: ExpenseGroup,
     :param payment_type: The payment type to use in the memo.
     :return: The memo.
     """
+
+    config = Configuration.objects.get(workspace_id=workspace_id)
+    if config.corporate_credit_card_expenses_object == 'CHARGE_CARD_TRANSACTION':
+        memo = 'Corporate Card Expense'
+        email = expense_group.description.get('employee_email')
+        if email:
+            memo = f'{memo} by {email}'
+
+        # Internal ID
+        count = ExportTable.objects.filter(memo__contains=memo, expense_group__workspace_id=workspace_id).count()
+        if count > 0:
+            memo = f'{memo} - {count}'
+
+        return memo
+
     expense_fund_source = 'Reimbursable expense' if expense_group.fund_source == 'PERSONAL' \
         else 'Corporate Credit Card expense'
     unique_number = None

tests/test_sageintacct/test_models.py

@@ -620,6 +620,35 @@ def test_get_memo(db):
 
     get_memo(expense_group, Bill, workspace_id)
 
+    expense_group = ExpenseGroup.objects.get(id=2)
+    workspace_id = expense_group.workspace.id
+
+    config = Configuration.objects.get(workspace_id=workspace_id)
+    config.corporate_credit_card_expenses_object = 'CHARGE_CARD_TRANSACTION'
+    config.save()
+
+    expense_group.description['employee_email'] = '[email protected]'
+    expense_group.save()
+
+    memo = get_memo(expense_group, ChargeCardTransaction, workspace_id)
+    assert memo == 'Corporate Card Expense by [email protected]'
+
+    ChargeCardTransaction.create_charge_card_transaction(expense_group)
+
+    memo = get_memo(expense_group, ChargeCardTransaction, workspace_id)
+    assert memo == 'Corporate Card Expense by [email protected] - 1'
+
+    for i in range(3):
+        expense_group = ExpenseGroup.objects.get(id=i + 1)
+        expense_group.description['employee_email'] = '[email protected]'
+        expense_group.save()
+
+        ChargeCardTransaction.create_charge_card_transaction(expense_group)
+
+    memo = get_memo(expense_group, ChargeCardTransaction, workspace_id)
+    assert memo == 'Corporate Card Expense by [email protected] - 3'
+
+
 def test_get_item_id_or_none(db, mocker):
     workspace_id = 1