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

renamed income/expense

Browse Source
This commit is contained in:
denisdulici
2019-12-31 15:49:09 +03:00
parent e2189158b9
commit 2428feb73b
235 changed files with 815 additions and 2147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Api/Common/Contacts.php
View File

@ -21,10 +21,10 @@ class Contacts extends ApiController
public function __construct()
{
// Add CRUD permission check
$this->middleware('permission:create-incomes-customers')->only(['create', 'store', 'duplicate', 'import']);
$this->middleware('permission:read-incomes-customers')->only(['index', 'show', 'edit', 'export']);
$this->middleware('permission:update-incomes-customers')->only(['update', 'enable', 'disable']);
$this->middleware('permission:delete-incomes-customers')->only('destroy');
$this->middleware('permission:create-sales-customers')->only(['create', 'store', 'duplicate', 'import']);
$this->middleware('permission:read-sales-customers')->only(['index', 'show', 'edit', 'export']);
$this->middleware('permission:update-sales-customers')->only(['update', 'enable', 'disable']);
$this->middleware('permission:delete-sales-customers')->only('destroy');
}
/**

14
app/Http/Controllers/Api/Expenses/Bills.php → app/Http/Controllers/Api/Purchases/Bills.php
View File

@ -1,14 +1,14 @@
<?php
namespace App\Http\Controllers\Api\Expenses;
namespace App\Http\Controllers\Api\Purchases;
use App\Abstracts\Http\ApiController;
use App\Http\Requests\Expense\Bill as Request;
use App\Jobs\Expense\CreateBill;
use App\Jobs\Expense\DeleteBill;
use App\Jobs\Expense\UpdateBill;
use App\Models\Expense\Bill;
use App\Transformers\Expense\Bill as Transformer;
use App\Http\Requests\Purchase\Bill as Request;
use App\Jobs\Purchase\CreateBill;
use App\Jobs\Purchase\DeleteBill;
use App\Jobs\Purchase\UpdateBill;
use App\Models\Purchase\Bill;
use App\Transformers\Purchase\Bill as Transformer;
class Bills extends ApiController
{

4
app/Http/Controllers/Api/Incomes/InvoiceTransactions.php → app/Http/Controllers/Api/Sales/InvoiceTransactions.php
View File

@ -1,12 +1,12 @@
<?php
namespace App\Http\Controllers\Api\Incomes;
namespace App\Http\Controllers\Api\Sales;
use App\Http\Requests\Banking\Transaction as Request;
use App\Jobs\Banking\CreateDocumentTransaction;
use App\Jobs\Banking\DeleteTransaction;
use App\Models\Banking\Transaction;
use App\Models\Income\Invoice;
use App\Models\Sale\Invoice;
use App\Transformers\Banking\Transaction as Transformer;
use Dingo\Api\Routing\Helpers;
use Illuminate\Foundation\Bus\DispatchesJobs;

14
app/Http/Controllers/Api/Incomes/Invoices.php → app/Http/Controllers/Api/Sales/Invoices.php
View File

@ -1,14 +1,14 @@
<?php
namespace App\Http\Controllers\Api\Incomes;
namespace App\Http\Controllers\Api\Sales;
use App\Abstracts\Http\ApiController;
use App\Http\Requests\Income\Invoice as Request;
use App\Jobs\Income\CreateInvoice;
use App\Jobs\Income\DeleteInvoice;
use App\Jobs\Income\UpdateInvoice;
use App\Models\Income\Invoice;
use App\Transformers\Income\Invoice as Transformer;
use App\Http\Requests\Sale\Invoice as Request;
use App\Jobs\Sale\CreateInvoice;
use App\Jobs\Sale\DeleteInvoice;
use App\Jobs\Sale\UpdateInvoice;
use App\Models\Sale\Invoice;
use App\Transformers\Sale\Invoice as Transformer;
class Invoices extends ApiController
{

4
app/Http/Controllers/Auth/Users.php
View File

@ -201,7 +201,7 @@ class Users extends Controller
// Mark bill notifications as read
foreach ($user->unreadNotifications as $notification) {
// Not a bill notification
if ($notification->getAttribute('type') != 'App\Notifications\Expense\Bill') {
if ($notification->getAttribute('type') != 'App\Notifications\Purchase\Bill') {
continue;
}
@ -223,7 +223,7 @@ class Users extends Controller
// Mark invoice notifications as read
foreach ($user->unreadNotifications as $notification) {
// Not an invoice notification
if ($notification->getAttribute('type') != 'App\Notifications\Income\Invoice') {
if ($notification->getAttribute('type') != 'App\Notifications\Sale\Invoice') {
continue;
}

16
app/Http/Controllers/Common/Search.php
View File

@ -6,8 +6,8 @@ use App\Abstracts\Http\Controller;
use App\Models\Banking\Account;
use App\Models\Banking\Transaction;
use App\Models\Common\Contact;
use App\Models\Expense\Bill;
use App\Models\Income\Invoice;
use App\Models\Purchase\Bill;
use App\Models\Sale\Invoice;
use App\Models\Common\Item;
use App\Traits\Contacts;
@ -63,7 +63,7 @@ class Search extends Controller
'name' => $invoice->invoice_number . ' - ' . $invoice->contact_name,
'type' => trans_choice('general.invoices', 1),
'color' => '#6da252',
'href' => url('incomes/invoices/' . $invoice->id),
'href' => url('sales/invoices/' . $invoice->id),
];
}
}/*
@ -77,7 +77,7 @@ class Search extends Controller
'name' => $transaction->contact_name,
'type' => trans_choice('general.revenues', 1),
'color' => '#00c0ef',
'href' => url('incomes/revenues/' . $transaction->id),
'href' => url('sales/revenues/' . $transaction->id),
];
}
}*/
@ -91,7 +91,7 @@ class Search extends Controller
'name' => $customer->name,
'type' => trans_choice('general.customers', 1),
'color' => '#328aef',
'href' => url('incomes/customers/' . $customer->id),
'href' => url('sales/customers/' . $customer->id),
];
}
}
@ -105,7 +105,7 @@ class Search extends Controller
'name' => $bill->bill_number . ' - ' . $bill->contact_name,
'type' => trans_choice('general.bills', 1),
'color' => '#ef3232',
'href' => url('expenses/bills/' . $bill->id),
'href' => url('purchases/bills/' . $bill->id),
];
}
}
@ -119,7 +119,7 @@ class Search extends Controller
'name' => $revenue->contact_name,
'type' => trans_choice('general.revenues', 1),
'color' => '#00c0ef',
'href' => url('incomes/revenues/' . $revenue->id),
'href' => url('sales/revenues/' . $revenue->id),
];
}
}*/
@ -133,7 +133,7 @@ class Search extends Controller
'name' => $vendor->name,
'type' => trans_choice('general.vendors', 1),
'color' => '#efef32',
'href' => url('expenses/vendors/' . $vendor->id),
'href' => url('purchases/vendors/' . $vendor->id),
];
}
}

10
app/Http/Controllers/Modals/BillTransactions.php
View File

@ -7,7 +7,7 @@ use App\Http\Requests\Banking\Transaction as Request;
use App\Jobs\Banking\CreateDocumentTransaction;
use App\Models\Banking\Account;
use App\Models\Banking\Transaction;
use App\Models\Expense\Bill;
use App\Models\Purchase\Bill;
use App\Models\Setting\Currency;
use App\Utilities\Modules;
use App\Traits\Uploads;
@ -22,10 +22,10 @@ class BillTransactions extends Controller
public function __construct()
{
// Add CRUD permission check
$this->middleware('permission:create-expenses-bills')->only(['create', 'store', 'duplicate', 'import']);
$this->middleware('permission:read-expenses-bills')->only(['index', 'show', 'edit', 'export']);
$this->middleware('permission:update-expenses-bills')->only(['update', 'enable', 'disable']);
$this->middleware('permission:delete-expenses-bills')->only('destroy');
$this->middleware('permission:create-purchases-bills')->only(['create', 'store', 'duplicate', 'import']);
$this->middleware('permission:read-purchases-bills')->only(['index', 'show', 'edit', 'export']);
$this->middleware('permission:update-purchases-bills')->only(['update', 'enable', 'disable']);
$this->middleware('permission:delete-purchases-bills')->only('destroy');
}
/**

8
app/Http/Controllers/Modals/Customers.php
View File

@ -15,10 +15,10 @@ class Customers extends Controller
public function __construct()
{
// Add CRUD permission check
$this->middleware('permission:create-incomes-customers')->only(['create', 'store', 'duplicate', 'import']);
$this->middleware('permission:read-incomes-customers')->only(['index', 'show', 'edit', 'export']);
$this->middleware('permission:update-incomes-customers')->only(['update', 'enable', 'disable']);
$this->middleware('permission:delete-incomes-customers')->only('destroy');
$this->middleware('permission:create-sales-customers')->only(['create', 'store', 'duplicate', 'import']);
$this->middleware('permission:read-sales-customers')->only(['index', 'show', 'edit', 'export']);
$this->middleware('permission:update-sales-customers')->only(['update', 'enable', 'disable']);
$this->middleware('permission:delete-sales-customers')->only('destroy');
}
/**

12
app/Http/Controllers/Modals/InvoiceTransactions.php
View File

@ -3,11 +3,11 @@
namespace App\Http\Controllers\Modals;
use App\Abstracts\Http\Controller;
use App\Events\Income\PaymentReceived;
use App\Events\Sale\PaymentReceived;
use App\Http\Requests\Banking\Transaction as Request;
use App\Models\Banking\Account;
use App\Models\Banking\Transaction;
use App\Models\Income\Invoice;
use App\Models\Sale\Invoice;
use App\Models\Setting\Currency;
use App\Utilities\Modules;
use App\Traits\Uploads;
@ -22,10 +22,10 @@ class InvoiceTransactions extends Controller
public function __construct()
{
// Add CRUD permission check
$this->middleware('permission:create-incomes-invoices')->only(['create', 'store', 'duplicate', 'import']);
$this->middleware('permission:read-incomes-invoices')->only(['index', 'show', 'edit', 'export']);
$this->middleware('permission:update-incomes-invoices')->only(['update', 'enable', 'disable']);
$this->middleware('permission:delete-incomes-invoices')->only('destroy');
$this->middleware('permission:create-sales-invoices')->only(['create', 'store', 'duplicate', 'import']);
$this->middleware('permission:read-sales-invoices')->only(['index', 'show', 'edit', 'export']);
$this->middleware('permission:update-sales-invoices')->only(['update', 'enable', 'disable']);
$this->middleware('permission:delete-sales-invoices')->only('destroy');
}
/**

8
app/Http/Controllers/Modals/Vendors.php
View File

@ -15,10 +15,10 @@ class Vendors extends Controller
public function __construct()
{
// Add CRUD permission check
$this->middleware('permission:create-expenses-vendors')->only(['create', 'store', 'duplicate', 'import']);
$this->middleware('permission:read-expenses-vendors')->only(['index', 'show', 'edit', 'export']);
$this->middleware('permission:update-expenses-vendors')->only(['update', 'enable', 'disable']);
$this->middleware('permission:delete-expenses-vendors')->only('destroy');
$this->middleware('permission:create-purchases-vendors')->only(['create', 'store', 'duplicate', 'import']);
$this->middleware('permission:read-purchases-vendors')->only(['index', 'show', 'edit', 'export']);
$this->middleware('permission:update-purchases-vendors')->only(['update', 'enable', 'disable']);
$this->middleware('permission:delete-purchases-vendors')->only('destroy');
}
/**

2
app/Http/Controllers/Portal/Dashboard.php
View File

@ -3,7 +3,7 @@
namespace App\Http\Controllers\Portal;
use App\Abstracts\Http\Controller;
use App\Models\Income\Invoice;
use App\Models\Sale\Invoice;
use App\Utilities\Chartjs;
use Date;

12
app/Http/Controllers/Portal/Invoices.php
View File

@ -5,8 +5,8 @@ namespace App\Http\Controllers\Portal;
use App\Abstracts\Http\Controller;
use App\Models\Banking\Account;
use App\Models\Common\Contact;
use App\Models\Income\Invoice;
use App\Models\Income\InvoiceStatus;
use App\Models\Sale\Invoice;
use App\Models\Sale\InvoiceStatus;
use App\Models\Setting\Category;
use App\Models\Setting\Currency;
use App\Traits\Currencies;
@ -61,7 +61,7 @@ class Invoices extends Controller
$payment_methods = Modules::getPaymentMethods();
event(new \App\Events\Income\InvoiceViewed($invoice));
event(new \App\Events\Sale\InvoiceViewed($invoice));
return view('portal.invoices.show', compact('invoice', 'accounts', 'currencies', 'account_currency_code', 'customers', 'categories', 'payment_methods'));
}
@ -124,9 +124,9 @@ class Invoices extends Controller
$invoice->paid = $paid;
$invoice->template_path = 'incomes.invoices.print';
$invoice->template_path = 'sales.invoices.print';
event(new \App\Events\Income\InvoicePrinting($invoice));
event(new \App\Events\Sale\InvoicePrinting($invoice));
return $invoice;
}
@ -178,7 +178,7 @@ class Invoices extends Controller
$print_action = URL::signedRoute('signed.invoices.print', [$invoice->id, 'company_id' => session('company_id')]);
$pdf_action = URL::signedRoute('signed.invoices.pdf', [$invoice->id, 'company_id' => session('company_id')]);
event(new \App\Events\Income\InvoiceViewed($invoice));
event(new \App\Events\Sale\InvoiceViewed($invoice));
return view('portal.invoices.signed', compact('invoice', 'accounts', 'currencies', 'account_currency_code', 'customers', 'categories', 'payment_methods', 'payment_actions', 'print_action', 'pdf_action'));
}

2
app/Http/Controllers/Portal/Profile.php
View File

@ -82,7 +82,7 @@ class Profile extends Controller
// Mark invoice notifications as read
foreach ($user->unreadNotifications as $notification) {
// Not an invoice notification
if ($notification->getAttribute('type') != 'App\Notifications\Income\Invoice') {
if ($notification->getAttribute('type') != 'App\Notifications\Sale\Invoice') {
continue;
}

36
app/Http/Controllers/Expenses/Bills.php → app/Http/Controllers/Purchases/Bills.php
View File

@ -1,23 +1,23 @@
<?php
namespace App\Http\Controllers\Expenses;
namespace App\Http\Controllers\Purchases;
use App\Abstracts\Http\Controller;
use App\Exports\Expenses\Bills as Export;
use App\Exports\Purchases\Bills as Export;
use App\Http\Requests\Common\Import as ImportRequest;
use App\Http\Requests\Expense\Bill as Request;
use App\Http\Requests\Expense\BillAddItem as ItemRequest;
use App\Imports\Expenses\Bills as Import;
use App\Jobs\Expense\CreateBill;
use App\Jobs\Expense\DeleteBill;
use App\Jobs\Expense\DuplicateBill;
use App\Jobs\Expense\UpdateBill;
use App\Http\Requests\Purchase\Bill as Request;
use App\Http\Requests\Purchase\BillAddItem as ItemRequest;
use App\Imports\Purchases\Bills as Import;
use App\Jobs\Purchase\CreateBill;
use App\Jobs\Purchase\DeleteBill;
use App\Jobs\Purchase\DuplicateBill;
use App\Jobs\Purchase\UpdateBill;
use App\Models\Banking\Account;
use App\Models\Common\Contact;
use App\Models\Common\Item;
use App\Models\Expense\BillStatus;
use App\Models\Expense\Bill;
use App\Models\Expense\BillHistory;
use App\Models\Purchase\BillStatus;
use App\Models\Purchase\Bill;
use App\Models\Purchase\BillHistory;
use App\Models\Setting\Category;
use App\Models\Setting\Currency;
use App\Models\Setting\Tax;
@ -49,7 +49,7 @@ class Bills extends Controller
return $item;
})->pluck('name', 'code'));
return view('expenses.bills.index', compact('bills', 'vendors', 'categories', 'statuses'));
return view('purchases.bills.index', compact('bills', 'vendors', 'categories', 'statuses'));
}
/**
@ -77,7 +77,7 @@ class Bills extends Controller
$date_format = $this->getCompanyDateFormat();
return view('expenses.bills.show', compact('bill', 'accounts', 'currencies', 'currency', 'account_currency_code', 'vendors', 'categories', 'payment_methods', 'date_format'));
return view('purchases.bills.show', compact('bill', 'accounts', 'currencies', 'currency', 'account_currency_code', 'vendors', 'categories', 'payment_methods', 'date_format'));
}
/**
@ -99,7 +99,7 @@ class Bills extends Controller
$categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
return view('expenses.bills.create', compact('vendors', 'currencies', 'currency', 'items', 'taxes', 'categories'));
return view('purchases.bills.create', compact('vendors', 'currencies', 'currency', 'items', 'taxes', 'categories'));
}
/**
@ -193,7 +193,7 @@ class Bills extends Controller
$categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
return view('expenses.bills.edit', compact('bill', 'vendors', 'currencies', 'currency', 'items', 'taxes', 'categories'));
return view('purchases.bills.edit', compact('bill', 'vendors', 'currencies', 'currency', 'items', 'taxes', 'categories'));
}
/**
@ -347,7 +347,7 @@ class Bills extends Controller
$currency->precision = (int) $currency->precision;
}
$html = view('expenses.bills.item', compact('item_row', 'taxes', 'currency'))->render();
$html = view('purchases.bills.item', compact('item_row', 'taxes', 'currency'))->render();
return response()->json([
'success' => true,
@ -378,7 +378,7 @@ class Bills extends Controller
$bill->paid = $paid;
$bill->template_path = 'expenses.bills.print';
$bill->template_path = 'purchases.bills.print';
return $bill;
}

12
app/Http/Controllers/Expenses/Payments.php → app/Http/Controllers/Purchases/Payments.php
View File

@ -1,12 +1,12 @@
<?php
namespace App\Http\Controllers\Expenses;
namespace App\Http\Controllers\Purchases;
use App\Abstracts\Http\Controller;
use App\Exports\Expenses\Payments as Export;
use App\Exports\Purchases\Payments as Export;
use App\Http\Requests\Banking\Transaction as Request;
use App\Http\Requests\Common\Import as ImportRequest;
use App\Imports\Expenses\Payments as Import;
use App\Imports\Purchases\Payments as Import;
use App\Jobs\Banking\CreateTransaction;
use App\Jobs\Banking\DeleteTransaction;
use App\Jobs\Banking\UpdateTransaction;
@ -41,7 +41,7 @@ class Payments extends Controller
$transfer_cat_id = Category::transfer();
return view('expenses.payments.index', compact('payments', 'vendors', 'categories', 'accounts', 'transfer_cat_id'));
return view('purchases.payments.index', compact('payments', 'vendors', 'categories', 'accounts', 'transfer_cat_id'));
}
/**
@ -75,7 +75,7 @@ class Payments extends Controller
$payment_methods = Modules::getPaymentMethods();
return view('expenses.payments.create', compact('accounts', 'currencies', 'account_currency_code', 'currency', 'vendors', 'categories', 'payment_methods'));
return view('purchases.payments.create', compact('accounts', 'currencies', 'account_currency_code', 'currency', 'vendors', 'categories', 'payment_methods'));
}
/**
@ -165,7 +165,7 @@ class Payments extends Controller
$date_format = $this->getCompanyDateFormat();
return view('expenses.payments.edit', compact('payment', 'accounts', 'currencies', 'currency', 'vendors', 'categories', 'payment_methods', 'date_format'));
return view('purchases.payments.edit', compact('payment', 'accounts', 'currencies', 'currency', 'vendors', 'categories', 'payment_methods', 'date_format'));
}
/**

16
app/Http/Controllers/Expenses/Vendors.php → app/Http/Controllers/Purchases/Vendors.php
View File

@ -1,18 +1,18 @@
<?php
namespace App\Http\Controllers\Expenses;
namespace App\Http\Controllers\Purchases;
use App\Abstracts\Http\Controller;
use App\Exports\Expenses\Vendors as Export;
use App\Exports\Purchases\Vendors as Export;
use App\Http\Requests\Common\Contact as Request;
use App\Http\Requests\Common\Import as ImportRequest;
use App\Imports\Expenses\Vendors as Import;
use App\Imports\Purchases\Vendors as Import;
use App\Jobs\Common\CreateContact;
use App\Jobs\Common\DeleteContact;
use App\Jobs\Common\UpdateContact;
use App\Models\Banking\Transaction;
use App\Models\Common\Contact;
use App\Models\Expense\Bill;
use App\Models\Purchase\Bill;
use App\Models\Setting\Currency;
use App\Traits\Contacts;
use Date;
@ -30,7 +30,7 @@ class Vendors extends Controller
{
$vendors = Contact::type($this->getVendorTypes())->collect();
return view('expenses.vendors.index', compact('vendors'));
return view('purchases.vendors.index', compact('vendors'));
}
/**
@ -86,7 +86,7 @@ class Vendors extends Controller
$transactions = $this->paginate($transactions->sortByDesc('paid_at'), $limit);
$bills = $this->paginate($bills->sortByDesc('paid_at'), $limit);
return view('expenses.vendors.show', compact('vendor', 'counts', 'amounts', 'transactions', 'bills'));
return view('purchases.vendors.show', compact('vendor', 'counts', 'amounts', 'transactions', 'bills'));
}
/**
@ -98,7 +98,7 @@ class Vendors extends Controller
{
$currencies = Currency::enabled()->pluck('name', 'code');
return view('expenses.vendors.create', compact('currencies'));
return view('purchases.vendors.create', compact('currencies'));
}
/**
@ -176,7 +176,7 @@ class Vendors extends Controller
{
$currencies = Currency::enabled()->pluck('name', 'code');
return view('expenses.vendors.edit', compact('vendor', 'currencies'));
return view('purchases.vendors.edit', compact('vendor', 'currencies'));
}
/**

16
app/Http/Controllers/Incomes/Customers.php → app/Http/Controllers/Sales/Customers.php
View File

@ -1,18 +1,18 @@
<?php
namespace App\Http\Controllers\Incomes;
namespace App\Http\Controllers\Sales;
use App\Abstracts\Http\Controller;
use App\Exports\Incomes\Customers as Export;
use App\Exports\Sales\Customers as Export;
use App\Http\Requests\Common\Contact as Request;
use App\Http\Requests\Common\Import as ImportRequest;
use App\Imports\Incomes\Customers as Import;
use App\Imports\Sales\Customers as Import;
use App\Jobs\Common\CreateContact;
use App\Jobs\Common\DeleteContact;
use App\Jobs\Common\UpdateContact;
use App\Models\Banking\Transaction;
use App\Models\Common\Contact;
use App\Models\Income\Invoice;
use App\Models\Sale\Invoice;
use App\Models\Setting\Currency;
use App\Traits\Contacts;
use Date;
@ -31,7 +31,7 @@ class Customers extends Controller
{
$customers = Contact::type($this->getCustomerTypes())->collect();
return view('incomes.customers.index', compact('customers'));
return view('sales.customers.index', compact('customers'));
}
/**
@ -92,7 +92,7 @@ class Customers extends Controller
$transactions = $this->paginate($transactions->sortByDesc('paid_at'), $limit);
$invoices = $this->paginate($invoices->sortByDesc('invoiced_at'), $limit);
return view('incomes.customers.show', compact('customer', 'counts', 'amounts', 'transactions', 'invoices'));
return view('sales.customers.show', compact('customer', 'counts', 'amounts', 'transactions', 'invoices'));
}
/**
@ -104,7 +104,7 @@ class Customers extends Controller
{
$currencies = Currency::enabled()->pluck('name', 'code');
return view('incomes.customers.create', compact('currencies'));
return view('sales.customers.create', compact('currencies'));
}
/**
@ -182,7 +182,7 @@ class Customers extends Controller
{
$currencies = Currency::enabled()->pluck('name', 'code');
return view('incomes.customers.edit', compact('customer', 'currencies'));
return view('sales.customers.edit', compact('customer', 'currencies'));
}
/**

48
app/Http/Controllers/Incomes/Invoices.php → app/Http/Controllers/Sales/Invoices.php
View File

@ -1,26 +1,26 @@
<?php
namespace App\Http\Controllers\Incomes;
namespace App\Http\Controllers\Sales;
use App\Abstracts\Http\Controller;
use App\Exports\Incomes\Invoices as Export;
use App\Exports\Sales\Invoices as Export;
use App\Http\Requests\Common\Import as ImportRequest;
use App\Http\Requests\Income\Invoice as Request;
use App\Http\Requests\Income\InvoiceAddItem as ItemRequest;
use App\Imports\Incomes\Invoices as Import;
use App\Jobs\Income\CreateInvoice;
use App\Jobs\Income\DeleteInvoice;
use App\Jobs\Income\DuplicateInvoice;
use App\Jobs\Income\UpdateInvoice;
use App\Http\Requests\Sale\Invoice as Request;
use App\Http\Requests\Sale\InvoiceAddItem as ItemRequest;
use App\Imports\Sales\Invoices as Import;
use App\Jobs\Sale\CreateInvoice;
use App\Jobs\Sale\DeleteInvoice;
use App\Jobs\Sale\DuplicateInvoice;
use App\Jobs\Sale\UpdateInvoice;
use App\Models\Banking\Account;
use App\Models\Common\Contact;
use App\Models\Common\Item;
use App\Models\Income\Invoice;
use App\Models\Income\InvoiceStatus;
use App\Models\Sale\Invoice;
use App\Models\Sale\InvoiceStatus;
use App\Models\Setting\Category;
use App\Models\Setting\Currency;
use App\Models\Setting\Tax;
use App\Notifications\Income\Invoice as Notification;
use App\Notifications\Sale\Invoice as Notification;
use App\Traits\Contacts;
use App\Traits\Currencies;
use App\Traits\DateTime;
@ -51,7 +51,7 @@ class Invoices extends Controller
return $item;
})->pluck('name', 'code'));
return view('incomes.invoices.index', compact('invoices', 'customers', 'categories', 'statuses'));
return view('sales.invoices.index', compact('invoices', 'customers', 'categories', 'statuses'));
}
/**
@ -81,7 +81,7 @@ class Invoices extends Controller
$date_format = $this->getCompanyDateFormat();
return view('incomes.invoices.show', compact('invoice', 'accounts', 'currencies', 'currency', 'account_currency_code', 'customers', 'categories', 'payment_methods', 'signed_url', 'date_format'));
return view('sales.invoices.show', compact('invoice', 'accounts', 'currencies', 'currency', 'account_currency_code', 'customers', 'categories', 'payment_methods', 'signed_url', 'date_format'));
}
/**
@ -105,7 +105,7 @@ class Invoices extends Controller
$number = $this->getNextInvoiceNumber();
return view('incomes.invoices.create', compact('customers', 'currencies', 'currency', 'items', 'taxes', 'categories', 'number'));
return view('sales.invoices.create', compact('customers', 'currencies', 'currency', 'items', 'taxes', 'categories', 'number'));
}
/**
@ -168,14 +168,14 @@ class Invoices extends Controller
\Excel::import(new Import(), $request->file('import'));
if (!$success) {
return redirect('common/import/incomes/invoices');
return redirect('common/import/sales/invoices');
}
$message = trans('messages.success.imported', ['type' => trans_choice('general.invoices', 2)]);
flash($message)->success();
return redirect('incomes/invoices');
return redirect('sales/invoices');
}
/**
@ -199,7 +199,7 @@ class Invoices extends Controller
$categories = Category::type('income')->enabled()->orderBy('name')->pluck('name', 'id');
return view('incomes.invoices.edit', compact('invoice', 'customers', 'currencies', 'currency', 'items', 'taxes', 'categories'));
return view('sales.invoices.edit', compact('invoice', 'customers', 'currencies', 'currency', 'items', 'taxes', 'categories'));
}
/**
@ -276,7 +276,7 @@ class Invoices extends Controller
*/
public function markSent(Invoice $invoice)
{
event(new \App\Events\Income\InvoiceSent($invoice));
event(new \App\Events\Sale\InvoiceSent($invoice));
$message = trans('invoices.messages.marked_sent');
@ -324,7 +324,7 @@ class Invoices extends Controller
unset($invoice->pdf_path);
unset($invoice->reconciled);
event(new \App\Events\Income\InvoiceSent($invoice));
event(new \App\Events\Sale\InvoiceSent($invoice));
flash(trans('invoices.messages.email_sent'))->success();
@ -383,7 +383,7 @@ class Invoices extends Controller
public function markPaid(Invoice $invoice)
{
try {
event(new \App\Events\Income\PaymentReceived($invoice, []));
event(new \App\Events\Sale\PaymentReceived($invoice, []));
$message = trans('invoices.messages.marked_paid');
@ -415,7 +415,7 @@ class Invoices extends Controller
$currency->precision = (int) $currency->precision;
}
$html = view('incomes.invoices.item', compact('item_row', 'taxes', 'currency'))->render();
$html = view('sales.invoices.item', compact('item_row', 'taxes', 'currency'))->render();
return response()->json([
'success' => true,
@ -446,9 +446,9 @@ class Invoices extends Controller
$invoice->paid = $paid;
$invoice->template_path = 'incomes.invoices.print_' . setting('invoice.template' ,'default');
$invoice->template_path = 'sales.invoices.print_' . setting('invoice.template' ,'default');
event(new \App\Events\Income\InvoicePrinting($invoice));
event(new \App\Events\Sale\InvoicePrinting($invoice));
return $invoice;
}

10
app/Http/Controllers/Incomes/Revenues.php → app/Http/Controllers/Sales/Revenues.php
View File

@ -1,9 +1,9 @@
<?php
namespace App\Http\Controllers\Incomes;
namespace App\Http\Controllers\Sales;
use App\Abstracts\Http\Controller;
use App\Exports\Incomes\Revenues as Export;
use App\Exports\Sales\Revenues as Export;
use App\Http\Requests\Banking\Transaction as Request;
use App\Http\Requests\Common\Import as ImportRequest;
use App\Imports\Common\Items as Import;
@ -41,7 +41,7 @@ class Revenues extends Controller
$transfer_cat_id = Category::transfer();
return view('incomes.revenues.index', compact('revenues', 'customers', 'categories', 'accounts', 'transfer_cat_id'));
return view('sales.revenues.index', compact('revenues', 'customers', 'categories', 'accounts', 'transfer_cat_id'));
}
/**
@ -75,7 +75,7 @@ class Revenues extends Controller
$payment_methods = Modules::getPaymentMethods();
return view('incomes.revenues.create', compact('accounts', 'currencies', 'account_currency_code', 'currency', 'customers', 'categories', 'payment_methods'));
return view('sales.revenues.create', compact('accounts', 'currencies', 'account_currency_code', 'currency', 'customers', 'categories', 'payment_methods'));
}
/**
@ -165,7 +165,7 @@ class Revenues extends Controller
$date_format = $this->getCompanyDateFormat();
return view('incomes.revenues.edit', compact('revenue', 'accounts', 'currencies', 'currency', 'customers', 'categories', 'payment_methods', 'date_format'));
return view('sales.revenues.edit', compact('revenue', 'accounts', 'currencies', 'currency', 'customers', 'categories', 'payment_methods', 'date_format'));
}
/**

4
app/Http/Controllers/Settings/Email.php
View File

@ -50,9 +50,9 @@ class Email extends Controller
'log' => trans('settings.email.log'),
];
$invoice_tags = implode(', ', app('App\Notifications\Income\Invoice')->getTags());
$invoice_tags = implode(', ', app('App\Notifications\Sale\Invoice')->getTags());
$payment_tags = implode(', ', app('App\Notifications\Portal\PaymentReceived')->getTags());
$bill_tags = implode(', ', app('App\Notifications\Expense\Bill')->getTags());
$bill_tags = implode(', ', app('App\Notifications\Purchase\Bill')->getTags());
return view('settings.email.edit', compact(
'setting',