Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix merge conflict
  • Loading branch information
mohitpanjwani committed Feb 3, 2020
1 parent 186004f commit aacffc2
Showing 1 changed file with 0 additions and 20 deletions.
20 changes: 0 additions & 20 deletions app/Http/Controllers/InvoicesController.php
Expand Up @@ -175,17 +175,7 @@ public function store(Requests\InvoicesRequest $request)
]);
}

<<<<<<< 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));
>>>>>>> c2eb22d66634a3b57d7ebade6ab9c7b359047c93
}

$invoice = Invoice::with(['items', 'user', 'invoiceTemplate', 'taxes'])->find($invoice->id);
Expand Down Expand Up @@ -414,17 +404,7 @@ public function sendInvoice(Request $request)
]);
}

<<<<<<< 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));
>>>>>>> c2eb22d66634a3b57d7ebade6ab9c7b359047c93

if ($invoice->status == Invoice::STATUS_DRAFT) {
$invoice->status = Invoice::STATUS_SENT;
Expand Down

0 comments on commit aacffc2

Please sign in to comment.