diff --git a/hypha/apply/dashboard/views.py b/hypha/apply/dashboard/views.py index 3be519e7f58a645468b84bbb2185f7969a74f708..2484885c534bda0bc27e366659ed609e10fe37be 100644 --- a/hypha/apply/dashboard/views.py +++ b/hypha/apply/dashboard/views.py @@ -15,7 +15,7 @@ from hypha.apply.funds.tables import ( review_filter_for_user, ) from hypha.apply.projects.filters import ProjectListFilter -from hypha.apply.projects.models import PaymentRequest, Project, vendor +from hypha.apply.projects.models import PaymentRequest, Project from hypha.apply.projects.tables import ( PaymentRequestsDashboardTable, ProjectsDashboardTable, diff --git a/hypha/apply/projects/forms/__init__.py b/hypha/apply/projects/forms/__init__.py index 02d6cffde33b5c07f83309ef79b408f52201d674..29c59a1b239b0c83a03cddcf47b68c74c8b3b858 100644 --- a/hypha/apply/projects/forms/__init__.py +++ b/hypha/apply/projects/forms/__init__.py @@ -6,23 +6,19 @@ from .payment import ( ) from .project import ( ApproveContractForm, - CreateProjectForm, - CreateApprovalForm, CreateApprovalForm, - ProjectEditForm, + CreateProjectForm, ProjectApprovalForm, + ProjectEditForm, RejectionForm, RemoveDocumentForm, SetPendingForm, - UploadContractForm, StaffUploadContractForm, - UploadDocumentForm, UpdateProjectLeadForm, + UploadContractForm, + UploadDocumentForm, ) -from .report import ( - ReportEditForm, - ReportFrequencyForm, -) +from .report import ReportEditForm, ReportFrequencyForm from .vendor import ( CreateVendorFormStep1, CreateVendorFormStep2, diff --git a/hypha/apply/projects/forms/vendor.py b/hypha/apply/projects/forms/vendor.py index 0edcdd25c79ca5c3df06d033429079d299cff0ee..4ec7677d8625bf2fa5ff16ea9fed130576bbc792 100644 --- a/hypha/apply/projects/forms/vendor.py +++ b/hypha/apply/projects/forms/vendor.py @@ -1,9 +1,9 @@ -from addressfield.fields import AddressField +from babel.numbers import get_currency_name, list_currencies from django import forms +from django_file_form.forms import FileFormMixin -from babel.numbers import list_currencies, get_currency_name +from addressfield.fields import AddressField from hypha.apply.stream_forms.fields import MultiFileField -from django_file_form.forms import FileFormMixin # from addressfield.fields import AddressField from ..models.vendor import VendorFormSettings diff --git a/hypha/apply/projects/models/__init__.py b/hypha/apply/projects/models/__init__.py index 0ccac178fdd9c603c5fdab69369486357787aceb..760e37b3dde0c4ce821cdb564e19582e05508c66 100644 --- a/hypha/apply/projects/models/__init__.py +++ b/hypha/apply/projects/models/__init__.py @@ -9,7 +9,7 @@ from .project import ( ProjectSettings, ) from .report import Report, ReportConfig, ReportPrivateFiles, ReportVersion -from .vendor import Vendor, BankInformation, DueDiligenceDocument +from .vendor import BankInformation, DueDiligenceDocument, Vendor __all__ = [ 'Project', diff --git a/hypha/apply/projects/models/vendor.py b/hypha/apply/projects/models/vendor.py index 43385b512ed02171d491461ad25c2d4e59082dc8..2c0635646e0ee5f2dacd357cdb6160c47c373f15 100644 --- a/hypha/apply/projects/models/vendor.py +++ b/hypha/apply/projects/models/vendor.py @@ -1,13 +1,10 @@ -from django.db import models from django.conf import settings -from django.db.models.fields import Field +from django.db import models from django.utils.translation import gettext_lazy as _ +from wagtail.admin.edit_handlers import FieldPanel, MultiFieldPanel from wagtail.contrib.settings.models import BaseSetting, register_setting from wagtail.core.fields import RichTextField -from wagtail.admin.edit_handlers import ( - FieldPanel, - MultiFieldPanel, -) + from hypha.apply.utils.storage import PrivateStorage diff --git a/hypha/apply/projects/templates/application_projects/vendor_form.html b/hypha/apply/projects/templates/application_projects/vendor_form.html index 9c43819661560de88e846212f81a040ea8b80361..f8e6ff33f8ce76cd00774e3c367fcc38f7dfd6a7 100644 --- a/hypha/apply/projects/templates/application_projects/vendor_form.html +++ b/hypha/apply/projects/templates/application_projects/vendor_form.html @@ -1,11 +1,11 @@ {% extends "base-apply.html" %} {% load static %} -{% block title %}{% if object %}Edit{% else %}Setup{% endif %} Contractor{% if object %}{{ object.project.title }}{% else %}{{ project.title }}{% endif %}{% endblock %} +{% block title %}{% if object %}Edit{% else %}Update{% endif %} Contractor{% if object %}{{ object.project.title }}{% else %}{{ project.title }}{% endif %}{% endblock %} {% block content %} <div class="admin-bar"> <div class="admin-bar__inner"> - <h2 class="heading heading--no-margin">{% if object %}Editing{% else %}Setup{% endif %} Contractor Information</h2> + <h2 class="heading heading--no-margin">Update Contractor Information</h2> </div> </div> diff --git a/hypha/apply/projects/urls.py b/hypha/apply/projects/urls.py index 8d7775569d8081a46ca486edf7694b909f0c9657..9eee94fcbeb6bd6bbad642591f9f90ed0c867f5e 100644 --- a/hypha/apply/projects/urls.py +++ b/hypha/apply/projects/urls.py @@ -1,9 +1,9 @@ -from os import name from django.urls import include, path from .views import ( ContractPrivateMediaView, CreatePaymentRequestView, + CreateVendorView, DeletePaymentRequestView, EditPaymentRequestView, PaymentRequestListView, @@ -21,7 +21,6 @@ from .views import ( ReportPrivateMedia, ReportSkipView, ReportUpdateView, - CreateVendorView, ) app_name = 'projects' diff --git a/hypha/apply/projects/views/__init__.py b/hypha/apply/projects/views/__init__.py index fecd26b3ba5b7931e77f481f02e5b2b41ef6440b..c08899889b941a0cc1d01e23b604d03e14122285 100644 --- a/hypha/apply/projects/views/__init__.py +++ b/hypha/apply/projects/views/__init__.py @@ -1,49 +1,47 @@ from .payment import ( ChangePaymentRequestStatusView, + CreatePaymentRequestView, DeletePaymentRequestView, + EditPaymentRequestView, PaymentRequestAdminView, PaymentRequestApplicantView, - PaymentRequestView, - CreatePaymentRequestView, - EditPaymentRequestView, - PaymentRequestPrivateMedia, PaymentRequestListView, + PaymentRequestPrivateMedia, + PaymentRequestView, ) from .project import ( - SendForApprovalView, - CreateApprovalView, - RejectionView, - UploadDocumentView, - RemoveDocumentView, - SelectDocumentView, - UpdateLeadView, - ApproveContractView, - UploadContractView, - BaseProjectDetailView, AdminProjectDetailView, ApplicantProjectDetailView, - ProjectDetailView, - ProjectPrivateMediaView, + ApplicantProjectEditView, + ApproveContractView, + BaseProjectDetailView, ContractPrivateMediaView, - ProjectDetailSimplifiedView, - ProjectDetailPDFView, + CreateApprovalView, ProjectApprovalEditView, - ApplicantProjectEditView, + ProjectDetailPDFView, + ProjectDetailSimplifiedView, + ProjectDetailView, ProjectEditView, ProjectListView, ProjectOverviewView, + ProjectPrivateMediaView, + RejectionView, + RemoveDocumentView, + SelectDocumentView, + SendForApprovalView, + UpdateLeadView, + UploadContractView, + UploadDocumentView, ) from .report import ( ReportDetailView, - ReportUpdateView, - ReportPrivateMedia, - ReportSkipView, ReportFrequencyUpdate, ReportListView, + ReportPrivateMedia, + ReportSkipView, + ReportUpdateView, ) -from .vendor import ( - CreateVendorView, -) +from .vendor import CreateVendorView __all__ = [ 'ChangePaymentRequestStatusView', diff --git a/hypha/apply/projects/views/vendor.py b/hypha/apply/projects/views/vendor.py index c2190699280e2c937fb3ea00f36e42afd6632f56..ab8cc067de8484cb82466b2976f09bf72fa055b9 100644 --- a/hypha/apply/projects/views/vendor.py +++ b/hypha/apply/projects/views/vendor.py @@ -1,13 +1,13 @@ import json -from django.shortcuts import get_object_or_404, render + from django.core.exceptions import PermissionDenied from django.db.models.fields.files import FieldFile - -from wagtail.core.models import Site +from django.shortcuts import get_object_or_404, render from formtools.wizard.views import SessionWizardView +from wagtail.core.models import Site + from hypha.apply.utils.storage import PrivateStorage -from ..models import Project, DueDiligenceDocument, BankInformation from ..forms import ( CreateVendorFormStep1, CreateVendorFormStep2, @@ -16,6 +16,7 @@ from ..forms import ( CreateVendorFormStep5, CreateVendorFormStep6, ) +from ..models import BankInformation, DueDiligenceDocument, Project def show_extra_info_form(wizard):