shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Invoice and Bill into Document

Browse Source
This commit is contained in:
Burak Çakırel
2020-12-24 01:28:38 +03:00
parent 830cc05957
commit 0c1424db47
436 changed files with 31655 additions and 37350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Middleware/DateFormat.php
View File

@ -17,7 +17,7 @@ class DateFormat
public function handle($request, Closure $next)
{
if (($request->method() == 'POST') || ($request->method() == 'PATCH')) {
$fields = ['paid_at', 'due_at', 'billed_at', 'invoiced_at', 'started_at', 'ended_at'];
$fields = ['paid_at', 'due_at', 'issued_at', 'started_at', 'ended_at'];
foreach ($fields as $field) {
$date = $request->get($field);

5
app/Http/Middleware/Money.php
View File

@ -17,8 +17,7 @@ class Money
{
if ($request->method() == 'POST' || $request->method() == 'PATCH') {
$amount = $request->get('amount');
$bill_number = $request->get('bill_number');
$invoice_number = $request->get('invoice_number');
$document_number = $request->get('document_number');
$sale_price = $request->get('sale_price');
$purchase_price = $request->get('purchase_price');
$opening_balance = $request->get('opening_balance');
@ -30,7 +29,7 @@ class Money
$request->request->set('amount', $amount);
}
if (isset($bill_number) || isset($invoice_number) || !empty($items)) {
if (isset($document_number) || !empty($items)) {
if (!empty($items)) {
foreach ($items as $key => $item) {
if (!isset($item['price'])) {

4
app/Http/Middleware/RedirectSignedIfAuthenticated.php
View File

@ -2,7 +2,7 @@
namespace App\Http\Middleware;
use App\Models\Sale\Invoice;
use App\Models\Document\Document;
use Closure;
class RedirectSignedIfAuthenticated
@ -27,7 +27,7 @@ class RedirectSignedIfAuthenticated
if ($request->segment(2) == 'invoices') {
$page = 'invoices.show';
$invoice = Invoice::find($request->segment(3));
$invoice = Document::find($request->segment(3));
$params = [$invoice->id];
}