From bc69046f3b88469d1b5a21c4adc64456bf5f2b87 Mon Sep 17 00:00:00 2001
From: Jay_Makwana <jaimakwana786@gmail.com>
Date: Tue, 12 Nov 2019 20:55:51 +0530
Subject: [PATCH] refactor template and deshboard invoice table

---
 .../assets/js/views/dashboard/Dashboard.vue   |  4 ++--
 resources/assets/js/views/estimates/Index.vue |  2 +-
 resources/assets/sass/pages/dashboard.scss    | 19 +++++++++++++++++++
 .../app/pdf/estimate/estimate1.blade.php      |  2 ++
 .../app/pdf/estimate/estimate2.blade.php      |  2 ++
 .../app/pdf/estimate/estimate3.blade.php      |  2 ++
 .../views/app/pdf/invoice/invoice1.blade.php  |  2 ++
 .../views/app/pdf/invoice/invoice2.blade.php  |  4 +++-
 .../views/app/pdf/invoice/invoice3.blade.php  |  4 +++-
 9 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/resources/assets/js/views/dashboard/Dashboard.vue b/resources/assets/js/views/dashboard/Dashboard.vue
index e3780514..bca6d07b 100644
--- a/resources/assets/js/views/dashboard/Dashboard.vue
+++ b/resources/assets/js/views/dashboard/Dashboard.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="app" class="main-content">
+  <div id="app" class="main-content dashboard">
     <div class="row">
       <div class="dash-item col-sm-6">
         <router-link slot="item-title" to="/admin/invoices">
@@ -177,7 +177,7 @@
             <table-column
               :sortable="false"
               :filterable="false"
-              cell-class="action-dropdown no-click"
+              cell-class="action-dropdown dashboard-recent-invoice-options no-click"
             >
               <template slot-scope="row">
                 <v-dropdown>
diff --git a/resources/assets/js/views/estimates/Index.vue b/resources/assets/js/views/estimates/Index.vue
index 3e5f9a63..14090a8a 100644
--- a/resources/assets/js/views/estimates/Index.vue
+++ b/resources/assets/js/views/estimates/Index.vue
@@ -417,7 +417,7 @@ export default {
       if (response.data) {
         this.filters.status = 'ACCEPTED'
         this.$refs.table.refresh()
-        window.toastr['success'](this.$tc('estimates.marked_as_rejected_message'))
+        window.toastr['success'](this.$tc('estimates.marked_as_accepted_message'))
       }
     },
     async onMarkAsRejected (id) {
diff --git a/resources/assets/sass/pages/dashboard.scss b/resources/assets/sass/pages/dashboard.scss
index ab91d3ee..d6ee557e 100644
--- a/resources/assets/sass/pages/dashboard.scss
+++ b/resources/assets/sass/pages/dashboard.scss
@@ -1,6 +1,23 @@
 // Dashboard
 // -------------------------
 
+.dashboard {
+
+    .dashboard-table
+    .table-component {
+
+        .dashboard-recent-invoice-options {
+
+            .dropdown-container {
+                margin: 10px 5px 0 -75px;
+            }
+
+        }
+
+    }
+
+}
+
 .dashbox {
     background-color: $white;
     box-shadow: $shadow;
@@ -364,5 +381,7 @@
                 justify-content: center;
             }
         }
+
     }
+
 }
diff --git a/resources/views/app/pdf/estimate/estimate1.blade.php b/resources/views/app/pdf/estimate/estimate1.blade.php
index 96b44376..c69b993e 100644
--- a/resources/views/app/pdf/estimate/estimate1.blade.php
+++ b/resources/views/app/pdf/estimate/estimate1.blade.php
@@ -182,6 +182,7 @@
             color: #595959;
             padding: 0px;
             margin: 0px;
+            width: 160px;
         }
         .ship-user-phone {
             font-style: normal;
@@ -229,6 +230,7 @@
             color: #595959;
             padding: 0px;
             margin: 0px;
+            width: 160px;
         }
 
         .bill-user-phone {
diff --git a/resources/views/app/pdf/estimate/estimate2.blade.php b/resources/views/app/pdf/estimate/estimate2.blade.php
index 63c9266e..778e1916 100644
--- a/resources/views/app/pdf/estimate/estimate2.blade.php
+++ b/resources/views/app/pdf/estimate/estimate2.blade.php
@@ -142,6 +142,7 @@
             color: #595959;
             padding: 0px;
             margin: 0px;
+            width: 170px;
         }
         .bill-user-phone {
             font-style: normal;
@@ -190,6 +191,7 @@
             color: #595959;
             padding: 0px;
             margin: 0px;
+            width: 170px;
         }
 
         .ship-user-phone {
diff --git a/resources/views/app/pdf/estimate/estimate3.blade.php b/resources/views/app/pdf/estimate/estimate3.blade.php
index dc02eb7e..fddcba17 100644
--- a/resources/views/app/pdf/estimate/estimate3.blade.php
+++ b/resources/views/app/pdf/estimate/estimate3.blade.php
@@ -146,6 +146,7 @@
             line-height: 15px;
             color: #595959;
             margin: 0px;
+            width: 160px;
         }
 
         .ship-user-phone {
@@ -184,6 +185,7 @@
             line-height: 15px;
             color: #595959;
             margin: 0px;
+            width: 160px;
         }
 
         .bill-user-phone {
diff --git a/resources/views/app/pdf/invoice/invoice1.blade.php b/resources/views/app/pdf/invoice/invoice1.blade.php
index c8e1668e..eed49d6d 100644
--- a/resources/views/app/pdf/invoice/invoice1.blade.php
+++ b/resources/views/app/pdf/invoice/invoice1.blade.php
@@ -182,6 +182,7 @@
             color: #595959;
             padding: 0px;
             margin: 0px;
+            width: 160px;
         }
         .ship-user-phone {
             font-style: normal;
@@ -229,6 +230,7 @@
             color: #595959;
             padding: 0px;
             margin: 0px;
+            width: 160px;
         }
 
         .bill-user-phone {
diff --git a/resources/views/app/pdf/invoice/invoice2.blade.php b/resources/views/app/pdf/invoice/invoice2.blade.php
index 9bb4c04f..342c4960 100644
--- a/resources/views/app/pdf/invoice/invoice2.blade.php
+++ b/resources/views/app/pdf/invoice/invoice2.blade.php
@@ -142,6 +142,7 @@
             color: #595959;
             padding: 0px;
             margin: 0px;
+            width: 170px;
         }
         .bill-user-phone {
             font-style: normal;
@@ -190,6 +191,7 @@
             color: #595959;
             padding: 0px;
             margin: 0px;
+            width: 170px;
         }
 
         .ship-user-phone {
@@ -435,7 +437,7 @@
                 @include('app.pdf.invoice.partials.billing-address')
             </div>
         </div>
-        @include('app.pdf.invoice.partials.table')
+            @include('app.pdf.invoice.partials.table')
         @include('app.pdf.invoice.partials.notes')
     </div>
 </body>
diff --git a/resources/views/app/pdf/invoice/invoice3.blade.php b/resources/views/app/pdf/invoice/invoice3.blade.php
index 95d69718..cc079eb0 100644
--- a/resources/views/app/pdf/invoice/invoice3.blade.php
+++ b/resources/views/app/pdf/invoice/invoice3.blade.php
@@ -89,7 +89,7 @@
         }
 
         .bill-add {
-            display: inline;
+            display: block;
             float:left;
             width:40%;
             padding: 0 0 0 30px;
@@ -146,6 +146,7 @@
             line-height: 15px;
             color: #595959;
             margin: 0px;
+            width: 160px;
         }
 
         .ship-user-phone {
@@ -184,6 +185,7 @@
             line-height: 15px;
             color: #595959;
             margin:0px;
+            width: 160px;
         }
 
         .bill-user-phone {