Prechádzať zdrojové kódy

fix partner detail page

ShariX Developer 22 hodín pred
rodič
commit
6bfa675e7b

+ 13 - 14
sharix_admin/templates/sharix_admin/partner_detail.html

@@ -11,20 +11,19 @@
         <h5 class="card-title fw-bold mb-4">{{ company.legal_name }}</h5>
 
         <ul class="list-style-none">
-            <li><b>Представитель</b> {{ company.repr.get_full_name }}</li>
-            <li><b>Юр. адрес</b> {{ company.address }}</li>
-            
-	    {% comment %}
-            <!-- FIXME: Не настроено -->
-            <li><b>НДС</b> Не платит</li>
-	    {% endcomment %}
-            
-            <li><b>ИНН</b> {{ company.inn }}</li>
-            <li><b>ОГРН</b> {{ company.ogrn }}</li>
-            <li><b>Р/c</b> {{ company.rs }}</li>
-            <li><b>К/c</b> {{ company.ks }}</li>
-            <li><b>БИК</b> {{ company.bik }}</li>
-            <li><b>Банк</b> {{ company.bank_name }}</li>
+		<li><b>{{ captions.repr }}</b> {{ company.repr.get_full_name }}</li>
+		<li><b>{{ captions.address }}</b> {{ company.address }}</li>
+		<li><b>{{ captions.status }}</b> {{ company.address }}</li>
+		<li><b>{{ captions.inn }}</b> {{ company.address }}</li>
+		<li><b>{{ captions.kpp }}</b> {{ company.address }}</li>
+		<li><b>{{ captions.ogrn }}</b> {{ company.address }}</li>
+		
+{% if "METASERVICE-ADMIN" in user_groups %}
+		<li><b>{{ captions.bank_name }}</b> {{ company.address }}</li>
+		<li><b>{{ captions.bik }}</b> {{ company.address }}</li>
+		<li><b>{{ captions.rs }}</b> {{ company.address }}</li>
+		<li><b>{{ captions.ks }}</b> {{ company.address }}</li>
+{% endif %} 
         </ul>
     </div>
     {% comment %}    <a class="btn btn-primary btn-edit" href="{% url "sharix_admin:partner/edit" %}">

+ 0 - 9
sharix_admin/views/order.py

@@ -148,21 +148,12 @@ class OrderDetailView(BaseView, DetailView):
             raise Http404('Company does not exist')
 
         return render(request, template_name, context={
-            #'order': order,
-            #'test1': "test1",
-            #'order': order,
             'orders_help_texts': OrdersHelpTexts,
             'captions': OrdersVerboseNames,
             })
 
-#class OrderDetailView(BaseView, DetailView):
-#    model = Orders
-#    template_name = 'sharix_admin/order.html'
-#    context_object_name = 'order'
-#
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['orders_help_texts'] = OrdersHelpTexts
         context['captions'] = OrdersVerboseNames
-        #context['title'] = _('Order Details')
         return context

+ 15 - 1
sharix_admin/views/partner.py

@@ -23,6 +23,9 @@ from django_tables2 import SingleTableView
 from sharix_admin.tables import PartnersTable
 from sharix_admin.utils import group_required
 
+from dbsynce.docs.database.company import Company as CompanyHelpTexts
+from dbsynce.docs.verbose_names.company import Company as CompanyVerboseNames
+
 class MyPartnerBaseView(BaseView):
     page_name = 'partner'
 
@@ -44,7 +47,18 @@ class PartnerDetailView(BaseView, DetailView):
         except Company.DoesNotExist:
             raise Http404('Company does not exist')
 
-        return render(request, template_name, context={'company': company})
+        return render(request, template_name, context={
+            'help_texts': CompanyHelpTexts,
+            'captions': CompanyVerboseNames,
+            })
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['help_texts'] = CompanyHelpTexts
+        context['captions'] = CompanyVerboseNames
+        return context
+
+
     
 
 class MyPartnerDetailView(MyPartnerBaseView, DetailView):