Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into fix-view-status

app/Http/Controllers/EstimatesController.php

@@ -328,13 +328,13 @@ class EstimatesController extends Controller
             ]);
         }
 
+        \Mail::to($email)->send(new EstimatePdf($data, $notificationEmail));
+
         if ($estimate->status == Estimate::STATUS_DRAFT) {
             $estimate->status = Estimate::STATUS_SENT;
             $estimate->save();
         }
 
-        \Mail::to($email)->send(new EstimatePdf($data, $notificationEmail));
-
         return response()->json([
             'success' => true
         ]);

app/Http/Controllers/InvoicesController.php

@@ -392,13 +392,14 @@ class InvoicesController extends Controller
             ]);
         }
 
+        \Mail::to($email)->send(new invoicePdf($data, $notificationEmail));
+
         if ($invoice->status == Invoice::STATUS_DRAFT) {
             $invoice->status = Invoice::STATUS_SENT;
             $invoice->sent = true;
             $invoice->save();
         }
 
-        \Mail::to($email)->send(new invoicePdf($data, $notificationEmail));
 
         return response()->json([
             'success' => true

resources/assets/js/views/settings/UpdateApp.vue

@@ -13,7 +13,7 @@
           {{ $t('settings.update_app.check_update') }}
         </base-button>
         <hr>
-        <div class="mt-4 content">
+        <div v-if="isUpdateAvail" class="mt-4 content">
           <h3 class="page-title">{{ $t('settings.update_app.avail_update') }}</h3>
           <label class="input-label">{{ $t('settings.update_app.next_version') }}</label><br>
           <label class="version">{{ updateData.version }}</label>
@@ -24,13 +24,13 @@
             {{ $t('settings.update_app.update') }}
           </base-button>
         </div>
-        <!-- <div>
+        <div v-if="isUpdating">
           <h3 class="page-title">{{ $t('settings.update_app.update_progress') }}</h3>
           <p class="page-sub-title">
             {{ $t('settings.update_app.progress_text') }}
           </p>
           <font-awesome-icon icon="spinner" class="fa-spin"/>
-        </div> -->
+        </div>
       </div>
     </div>
   </div>
@@ -42,6 +42,7 @@ export default {
     return {
       isShowProgressBar: false,
       isUpdateAvail: false,
+      isUpdating: false,
       progress: 10,
       interval: null,
       description: '',
@@ -60,11 +61,14 @@ export default {
   },
   methods: {
     async onUpdateApp () {
+      this.isUpdating = true
       const data = this.updateData
       let response = await axios.post('/api/update', data)
       console.log(response.data)
+      this.isUpdating = false
     },
     async checkUpdate () {
+      this.isUpdateAvail = true
       let response = await axios.get('/api/check/update')
       console.log(response.data)
       if (response.data) {

resources/assets/sass/pages/settings.scss

@@ -153,6 +153,7 @@
 
     .version {
         background: #EAF1FB;
+        color: #A5ACC1;
         border: 1px solid #EAF1FB;
         box-sizing: border-box;
         border-radius: 5px;