TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2026-02-04 09:41:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'auto-update' of https://gitlab.com/mohit.panjvani/crater-web into auto-update

Browse Source
This commit is contained in:
Aman upadhyay
2019-11-15 13:59:26 +05:30
parent 40b0f84cb7 22784cc230
commit b3e212c9fd
6 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -306,8 +306,6 @@ class EstimatesController extends Controller
public function sendEstimate(Request $request)
{
$estimate = Estimate::findOrFail($request->id);
$estimate->status = Estimate::STATUS_SENT;
$estimate->save();
$data['estimate'] = $estimate->toArray();
$userId = $data['estimate']['user_id'];
@@ -330,6 +328,11 @@ class EstimatesController extends Controller
]);
}
if ($estimate->status == Estimate::STATUS_DRAFT) {
$estimate->status = Estimate::STATUS_SENT;
$estimate->save();
}
\Mail::to($email)->send(new EstimatePdf($data, $notificationEmail));
return response()->json([

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

@@ -371,12 +371,6 @@ class InvoicesController extends Controller
{
$invoice = Invoice::findOrFail($request->id);
if ($invoice->status == Invoice::STATUS_DRAFT) {
$invoice->status = Invoice::STATUS_SENT;
$invoice->sent = true;
$invoice->save();
}
$data['invoice'] = $invoice->toArray();
$userId = $data['invoice']['user_id'];
$data['user'] = User::find($userId)->toArray();
@@ -398,6 +392,12 @@ class InvoicesController extends Controller
]);
}
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([

2
app/Http/Controllers/UpdateController.php
View File

@@ -12,7 +12,7 @@ class UpdateController extends Controller
{
set_time_limit(600); // 10 minutes
$json = Updater::update($request->installed, $request->version);
$json = Updater::update($request->installed, $request->version, $request->isMinor);
return response()->json($json);
}