Merge pull request #6279 from beganovich/v5-576

Client portal: "Download" and "Open in new tab" buttons on documents show page

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Client portal: Show message when trying to approve non-approvable quotes
 - Client portal: Remove "Approve" button from single quote page if quote is non-approvable
 - Client portal: Hide "Pay now" buttons if no gateways are configured
+- Client portal: "Download" and "Open in new tab" buttons on documents show page
 
 ## Fixed:
 - Client portal: Showing message instead of blank page when trying to download zero quotes

public/mix-manifest.json

@@ -1,6 +1,6 @@
 {
     "/js/app.js": "/js/app.js?id=696e8203d5e8e7cf5ff5",
-    "/css/app.css": "/css/app.css?id=a482951cd2cc04bf5f01",
+    "/css/app.css": "/css/app.css?id=f4c07fdabcbe50c9f4be",
     "/js/clients/invoices/action-selectors.js": "/js/clients/invoices/action-selectors.js?id=a09bb529b8e1826f13b4",
     "/js/clients/invoices/payment.js": "/js/clients/invoices/payment.js?id=8ce8955ba775ea5f47d1",
     "/js/clients/linkify-urls.js": "/js/clients/linkify-urls.js?id=0dc8c34010d09195d2f7",

resources/views/portal/ninja2020/documents/show.blade.php

@@ -4,7 +4,7 @@
 @section('body')
 <div class="container mx-auto">
     <div class="grid grid-cols-12">
-        <div class="col-span-7 col-start-3">
+        <div class="col-span-12 lg:col-span-7 lg:col-start-3">
             <div class="bg-white shadow overflow-hidden sm:rounded-lg">
                 <div class="px-4 py-5 border-b border-gray-200 sm:px-6">
                     <h3 class="text-lg leading-6 font-medium text-gray-900">
@@ -22,13 +22,6 @@
                             </dt>
                             <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2 flex items-center">
                                 {{ Illuminate\Support\Str::limit($document->name, 40) }}
-                                <a href="{{ route('client.documents.download', $document->hashed_id) }}" class="ml-2 text-black hover:text-blue-600" download>
-                                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-download-cloud">
-                                        <polyline points="8 17 12 21 16 17"></polyline>
-                                        <line x1="12" y1="12" x2="12" y2="21"></line>
-                                        <path d="M20.88 18.09A5 5 0 0 0 18 9h-1.26A8 8 0 1 0 3 16.29"></path>
-                                    </svg>
-                                </a>
                             </dd>
                         </div>
                         <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
@@ -74,6 +67,28 @@
                     </dl>
                 </div>
             </div>
+
+            <div class="flex justify-end my-4">
+                <a href="{{ route('client.documents.download', $document->hashed_id) }}" class="button button-link bg-link text-gray-900 inline-flex items-center" download>
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-download-cloud">
+                        <polyline points="8 17 12 21 16 17"></polyline>
+                        <line x1="12" y1="12" x2="12" y2="21"></line>
+                        <path d="M20.88 18.09A5 5 0 0 0 18 9h-1.26A8 8 0 1 0 3 16.29"></path>
+                    </svg>
+
+                    <span class="ml-2">{{ ctrans('texts.download') }}</span>
+                </a>
+
+                <a href="{{ $document->generateUrl() }}" target="_blank" class="button button-primary bg-primary text-white inline-flex items-center">
+                    <svg xmlns="http://www.w3.org/2000/svg"  width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather">
+                        <path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path>
+                        <polyline points="15 3 21 3 21 9"></polyline>
+                        <line x1="10" y1="14" x2="21" y2="3"></line>
+                    </svg>
+
+                    <span class="ml-2">{{ ctrans('texts.open_in_new_tab') }}</span>
+                </a>
+            </div>
         </div>
     </div>
 </div>