Merge pull request #49 from Voltz-Corp/main

Merge
Voltz-Corp · Jun 10, 2024 · 117c04c · 117c04c
2 parents 21b4c3a + 0322f66
commit 117c04c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/app_client/templates/email/emailtemplate.html b/app_client/templates/email/emailtemplate.html
@@ -113,7 +113,7 @@ <h2>Olá, {{name}}</h2>
             {% endif %}
             {% if budget %}
                 <div>Orçamento definido: <strong id="budget">R$ {{budget}},00</strong></div>
-                <a href="https://voltz-eceeltec.azurewebsites.net/cliente/visualizar/{order_id}/">Clique aqui para aceitar ou recusar o orçamento</a>
+                <a href="https://voltz-eceeltec.azurewebsites.net/cliente/visualizar/{{order_id}}/">Clique aqui para aceitar ou recusar o orçamento</a>
             {% endif %}
         </div>
         <p class="footer">Eceel-Tec © 2024</p>

diff --git a/app_company/views.py b/app_company/views.py
@@ -410,13 +410,20 @@ def post(self, request, pk):
 class ServiceOrderDetailView(View):
     def get(self, request, pk):
         previous_url = request.META.get('HTTP_REFERER', '/')
+        current_url = request.build_absolute_uri()
         employees = Users.objects.filter(role='F')
         all_orders = OrderRequest.objects.all()
 
+        if current_url == previous_url:
+            request.session['previous_url'] = request.session['previous_url']
+        else:
+            request.session['previous_url'] = previous_url
+
+
         ctx = {
             "all_orders": all_orders,
             "employees": employees,
-            "previous_url": previous_url 
+            "previous_url": request.session['previous_url'] 
         }
 
         try: