Merge branch '29-Yuyu/change-method-storing-logo' into 'main'

29 yuyu/change method storing logo

Closes yuyu#29

See merge request dev/yuyu_dashboard!11

yuyu/admin/billing_setting/forms.py

@@ -1,3 +1,5 @@
+import base64
+
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import forms, messages, exceptions
@@ -10,8 +12,9 @@ class SettingForm(forms.SelfHandlingForm):
 
     company_name = forms.CharField(label=_("COMPANY NAME"),
                                    required=False)
-    company_logo = forms.URLField(label=_("COMPANY LOGO URL"),
+
-                                  required=False)
+    company_logo = forms.ImageField(label=_("COMPANY LOGO"),
+                                   required=False)
     company_address = forms.CharField(label=_("COMPANY ADDRESS"),
                                       required=False, widget=forms.Textarea())
     email_admin = forms.EmailField(label=_("EMAIL ADMIN"),
@@ -20,6 +23,17 @@ class SettingForm(forms.SelfHandlingForm):
     invoice_tax = forms.IntegerField(label=_("INVOICE TAX (%)"),
                                      required=True)
 
+    def clean(self):
+        data = super(SettingForm, self).clean()
+        company_logo = data.get('company_logo', None)
+
+        if company_logo:
+            company_logo = self.files['company_logo'].read()
+            encoded_string = base64.b64encode(company_logo)
+            data["company_logo"] = encoded_string
+
+        return data
+
     def handle(self, request, data):
         try:
             result = ""

yuyu/admin/billing_setting/templates/billing_setting/_form_setting.html

@@ -1,5 +1,6 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
+{% block form_attrs %}enctype="multipart/form-data"{% endblock %}
 
 {% block modal-body-right %}
   <h3>{% trans "Description:" %}</h3>

yuyu/admin/projects_invoice/templates/projects_invoice/base_invoice.html

@@ -56,7 +56,7 @@
                         <div class="invoice-title">
                             <div class="row">
                                 <div class="col-xs-12">
-                                    <img src="{{ setting.company_logo }}" alt="" height="50">
+                                    {{ setting.company_logo }}
                                 </div>
                             </div>
                             <br>

yuyu/cases/setting_use_case.py

@@ -1,10 +1,20 @@
 from openstack_dashboard.dashboards.yuyu.core import yuyu_client
 
+from django.utils.html import format_html
+
 
 class SettingUseCase:
 
     def get_settings(self, request):
         response = yuyu_client.get(request, "settings/").json()
+
+        if response["company_logo"]:
+            # convert base64 img
+            response['company_logo'] = format_html(
+                '<img height="50" src="data:;base64,{}">',
+                response['company_logo']
+            )
+
         return response
 
     def set_setting(self, request, key, value):

yuyu/project/invoice/templates/invoice/base_invoice.html

@@ -56,7 +56,7 @@
                         <div class="invoice-title">
                             <div class="row">
                                 <div class="col-xs-12">
-                                    <img src="{{ setting.company_logo }}" alt="" height="50">
+                                    {{ setting.company_logo }}
                                 </div>
                             </div>
                             <br>