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

fix merge conflict

Browse Source
This commit is contained in:
Mohit Panjwani
2020-02-03 21:15:07 +05:30
parent 186004f7f8
commit aacffc22eb
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,17 +175,7 @@ class InvoicesController extends Controller
]); ]);
} }
<<<<<<< HEAD
if (!config('mail.from.name')) {
return response()->json([
'error' => 'from_email_does_not_exist'
]);
}
\Mail::to($email)->send(new invoicePdf($data));
=======
\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); $invoice = Invoice::with(['items', 'user', 'invoiceTemplate', 'taxes'])->find($invoice->id);
@ -414,17 +404,7 @@ class InvoicesController extends Controller
]); ]);
} }
<<<<<<< HEAD
if (!config('mail.from.name')) {
return response()->json([
'error' => 'from_email_does_not_exist'
]);
}
\Mail::to($email)->send(new invoicePdf($data));
=======
\Mail::to($email)->send(new InvoicePdf($data)); \Mail::to($email)->send(new InvoicePdf($data));
>>>>>>> c2eb22d66634a3b57d7ebade6ab9c7b359047c93
if ($invoice->status == Invoice::STATUS_DRAFT) { if ($invoice->status == Invoice::STATUS_DRAFT) {
$invoice->status = Invoice::STATUS_SENT; $invoice->status = Invoice::STATUS_SENT;