Merge branch 'dev'

locale/es/LC_MESSAGES/django.po

@@ -641,3 +641,15 @@ msgstr "Pedidos por día"
 #: templates/stats/dashboard.html:66
 msgid "Period"
 msgstr "Periodo"
+
+#: templates/includes/solved_buttons.html:6
+msgid "Did you helped this request? Please tell us!"
+msgstr "¿Ayudaste este pedido ¡Contanos por favor!"
+
+#: templates/includes/solved_buttons.html:6
+msgid "Contact us via WhatsApp"
+msgstr "Avisanos por WhatsApp"
+
+#: templates/includes/solved_buttons.html:6
+msgid "Contact us via Twitter"
+msgstr "Avisanos por Twitter"

requirements.txt

@@ -1,5 +1,5 @@
-django~=2.2
-Pillow==8.2.0
+django==2.2.24
+Pillow==8.3.2
 psycopg2-binary==2.8.4 
 django-leaflet==0.26.0
 black

templates/footer/footer.html

@@ -14,11 +14,11 @@
 
         <div class="column is-three-fifth">
             <div class="columns is-mobile is-centered">
-                <figure class="image is-96x96">
-                    <!-- <a href="{% url 'login'%}?next={{request.path}}">
-                        {#<h6 class="is-full subtitle is-6 has-text-centered is-marginless">Apoya</h6>#}
-                        <img class="is-rounded" src="">
-                    </a> -->
+                <figure class="image">
+                    <a href="https://undiaparadar.org.py">
+                        <!-- <h6 class="is-full subtitle is-6 has-text-centered is-marginless">Apoya</h6> -->
+                        <img class="is-rounded" src="{% static "img/giving/giving_horizontal.png" %}">
+                    </a>
                 </figure>
             </div>
             <div class="columns  is-mobile is-centered">

templates/help_request/details.html

@@ -135,6 +135,7 @@
                      </a>
                 {% endif %}
 {% endif %}
+{% include 'includes/solved_buttons.html'%}
         </section>
                     {% include 'includes/vote_button.html' %}
 

templates/includes/solved_buttons.html

@@ -0,0 +1,24 @@
+{% load i18n %}
+
+{% with url=request.build_absolute_uri text=""|add:"Solucioné el pedido de "|add:name  users="@Ayudapyorg @UnDiaParaDarPy" %}
+<section class="card-content">
+    <p class="title"> {% trans "Did you helped this request? Please tell us!" %} </p>
+    <div class="field is-flex">
+
+        <p class="control">
+        <a href="https://wa.me/?text={{text}} {{url}}" target="_blank" class="button is-medium is-success is-outlined">
+            <span class="icon is-small">
+              <i class="fab fa-whatsapp"></i>
+            </span>
+            <span>{% trans "Contact us via WhatsApp" %}</span>
+        </a>
+        <a href="https://twitter.com/share?text={{users}} {{text}}&url={{url}}&hashtags=AyudaPy,UndiaParaDarPy,UndiaParaDar" target="_blank" class="button is-medium is-info is-outlined">
+            <span class="icon is-small">
+              <i class="fab fa-twitter"></i>
+            </span>
+            <span>{% trans "Contact us via Twitter" %}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        </a>
+        </p>
+    </div>
+</section >
+{% endwith %}