TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-27 19:51:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Mohit Panjwani
2020-01-31 14:28:16 +05:30
parent 06a538bb81 c2eb22d666
commit 186004f7f8
12 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,12 +175,6 @@ class EstimatesController extends Controller
]);
}
if (!config('mail.from.name')) {
return response()->json([
'error' => 'from_email_does_not_exist'
]);
}
\Mail::to($email)->send(new EstimatePdf($data));
}
@ -343,12 +337,6 @@ class EstimatesController extends Controller
]);
}
if (!config('mail.from.name')) {
return response()->json([
'error' => 'from_email_does_not_exist'
]);
}
\Mail::to($email)->send(new EstimatePdf($data));
if ($estimate->status == Estimate::STATUS_DRAFT) {

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

@ -12,7 +12,7 @@ use Crater\Invoice;
use Crater\InvoiceItem;
use Carbon\Carbon;
use Crater\Item;
use Crater\Mail\invoicePdf;
use Crater\Mail\InvoicePdf;
use function MongoDB\BSON\toJSON;
use Illuminate\Support\Facades\Log;
use Crater\User;
@ -175,6 +175,7 @@ class InvoicesController extends Controller
]);
}
<<<<<<< HEAD
if (!config('mail.from.name')) {
return response()->json([
'error' => 'from_email_does_not_exist'
@ -182,6 +183,9 @@ class InvoicesController extends Controller
}
\Mail::to($email)->send(new invoicePdf($data));
=======
\Mail::to($email)->send(new InvoicePdf($data));
>>>>>>> c2eb22d66634a3b57d7ebade6ab9c7b359047c93
}
$invoice = Invoice::with(['items', 'user', 'invoiceTemplate', 'taxes'])->find($invoice->id);
@ -410,6 +414,7 @@ class InvoicesController extends Controller
]);
}
<<<<<<< HEAD
if (!config('mail.from.name')) {
return response()->json([
'error' => 'from_email_does_not_exist'
@ -417,6 +422,9 @@ class InvoicesController extends Controller
}
\Mail::to($email)->send(new invoicePdf($data));
=======
\Mail::to($email)->send(new InvoicePdf($data));
>>>>>>> c2eb22d66634a3b57d7ebade6ab9c7b359047c93
if ($invoice->status == Invoice::STATUS_DRAFT) {
$invoice->status = Invoice::STATUS_SENT;

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

@ -305,10 +305,6 @@ class PaymentController extends Controller
$data['user'] = User::find($userId)->toArray();
$data['company'] = Company::find($payment->company_id);
$email = $data['user']['email'];
$notificationEmail = CompanySetting::getSetting(
'notification_email',
$request->header('company')
);
if (!$email) {
return response()->json([
@ -316,13 +312,7 @@ class PaymentController extends Controller
]);
}
if (!$notificationEmail) {
return response()->json([
'error' => 'notification_email_does_not_exist'
]);
}
\Mail::to($email)->send(new PaymentPdf($data, $notificationEmail));
\Mail::to($email)->send(new PaymentPdf($data));
return response()->json([
'success' => true