TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-11-01 22:21:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
satyaprakash10
2019-11-15 19:44:48 +05:30
parent d529c1d68f d7f73e8e9d
commit 69fbf73d6d
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/EstimatesController.php
View File

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

3
app/Http/Controllers/InvoicesController.php
View File

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

10
resources/assets/js/views/settings/UpdateApp.vue
View File

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

1
resources/assets/sass/pages/settings.scss vendored
View File

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