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

formatted modals

Browse Source
This commit is contained in:
denisdulici 2020-02-11 19:17:50 +03:00
parent 3c8db9a810
commit b32734b772
7 changed files with 63 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,28 +82,16 @@ class BillTransactions extends Controller
*/
public function store(Bill $bill, Request $request)
{
try {
$transaction = $this->dispatch(new CreateDocumentTransaction($bill, $request));
$response = $this->ajaxDispatch(new CreateDocumentTransaction($bill, $request));
if ($response['success']) {
$response['redirect'] = route('bills.show', $bill->id);
$message = trans('messages.success.added', ['type' => trans_choice('general.payments', 1)]);
flash($message)->success();
$response = [
'success' => true,
'error' => false,
'message' => $message,
'data' => $transaction,
'redirect' => route('bills.show', $bill->id),
];
} catch(\Exception $e) {
$response = [
'success' => false,
'error' => true,
'message' => $e->getMessage(),
'data' => 'null',
'redirect' => null,
];
} else {
$response['redirect'] = null;
}
return response()->json($response);

27
app/Http/Controllers/Modals/Categories.php
View File

@ -3,7 +3,8 @@
namespace App\Http\Controllers\Modals;
use App\Abstracts\Http\Controller;
use Illuminate\Http\Request as CRequest;
use App\Jobs\Setting\CreateCategory;
use Illuminate\Http\Request as IRequest;
class Categories extends Controller
{
@ -24,7 +25,7 @@ class Categories extends Controller
*
* @return Response
*/
public function create(CRequest $request)
public function create(IRequest $request)
{
$type = $request->get('type', 'item');
@ -37,4 +38,26 @@ class Categories extends Controller
'html' => $html,
]);
}
/**
* Store a newly created resource in storage.
*
* @param Request $request
*
* @return Response
*/
public function store(IRequest $request)
{
$request['enabled'] = 1;
$request['type'] = $request->get('type', 'income');
$request['color'] = $request->get('color', '#' . dechex(rand(0x000000, 0xFFFFFF)));
$response = $this->ajaxDispatch(new CreateCategory($request));
if ($response['success']) {
$response['message'] = trans('messages.success.added', ['type' => trans_choice('general.categories', 1)]);
}
return response()->json($response);
}
}

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

@ -4,7 +4,7 @@ namespace App\Http\Controllers\Modals;
use App\Abstracts\Http\Controller;
use App\Http\Requests\Common\Contact as Request;
use App\Models\Common\Contact;
use App\Jobs\Common\CreateContact;
use App\Models\Setting\Currency;
class Customers extends Controller
@ -59,16 +59,12 @@ class Customers extends Controller
{
$request['enabled'] = 1;
$customer = Contact::create($request->all());
$response = $this->ajaxDispatch(new CreateContact($request));
$message = trans('messages.success.added', ['type' => trans_choice('general.customers', 1)]);
if ($response['success']) {
$response['message'] = trans('messages.success.added', ['type' => trans_choice('general.customers', 1)]);
}
return response()->json([
'success' => true,
'error' => false,
'data' => $customer,
'message' => $message,
'html' => 'null',
]);
return response()->json($response);
}
}

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

@ -83,30 +83,16 @@ class InvoiceTransactions extends Controller
*/
public function store(Invoice $invoice, Request $request)
{
try {
event(new PaymentReceived($invoice, $request));
$response = $this->ajaxDispatch(new PaymentReceived($invoice, $request));
if ($response['success']) {
$response['redirect'] = route('invoices.show', $invoice->id);
$message = trans('messages.success.added', ['type' => trans_choice('general.payments', 1)]);
flash($message)->success();
$response = [
'success' => true,
'error' => false,
'message' => $message,
'redirect' => route('invoices.show', $invoice->id),
];
} catch(\Exception $e) {
$message = $e->getMessage();
//flash($message)->error();
$response = [
'success' => false,
'error' => true,
'message' => $message,
'redirect' => null,
];
} else {
$response['redirect'] = null;
}
return response()->json($response);

14
app/Http/Controllers/Modals/Items.php
View File

@ -3,13 +3,11 @@
namespace App\Http\Controllers\Modals;
use App\Abstracts\Http\Controller;
use Illuminate\Http\Request as Request;
use App\Jobs\Common\CreateItem;
use App\Models\Setting\Category;
use App\Models\Setting\Currency;
use App\Models\Setting\Tax;
use Illuminate\Http\Request as IRequest;
class Items extends Controller
{
@ -30,7 +28,7 @@ class Items extends Controller
*
* @return Response
*/
public function create(Request $request)
public function create(IRequest $request)
{
$categories = Category::type('item')->enabled()->orderBy('name')->pluck('name', 'id');
@ -54,7 +52,7 @@ class Items extends Controller
* @param $request
* @return Response
*/
public function store(Request $request)
public function store(IRequest $request)
{
if ($request->get('type', false) == 'inline') {
$data = [
@ -62,7 +60,7 @@ class Items extends Controller
'name' => '',
'sale_price' => 0,
'purchase_price' => 0,
'enabled' => 1
'enabled' => 1,
];
$data[$request->get('field')] = $request->get('value');
@ -72,6 +70,10 @@ class Items extends Controller
$response = $this->ajaxDispatch(new CreateItem($request));
if ($response['success']) {
$response['message'] = trans('messages.success.added', ['type' => trans_choice('general.items', 1)]);
}
return response()->json($response);
}
}

16
app/Http/Controllers/Modals/Taxes.php
View File

@ -4,7 +4,7 @@ namespace App\Http\Controllers\Modals;
use App\Abstracts\Http\Controller;
use App\Http\Requests\Setting\Tax as Request;
use App\Models\Setting\Tax;
use App\Jobs\Setting\CreateTax;
class Taxes extends Controller
{
@ -62,16 +62,12 @@ class Taxes extends Controller
{
$request['enabled'] = 1;
$tax = Tax::create($request->all());
$response = $this->ajaxDispatch(new CreateTax($request));
$message = trans('messages.success.added', ['type' => trans_choice('general.taxes', 1)]);
if ($response['success']) {
$response['message'] = trans('messages.success.added', ['type' => trans_choice('general.taxes', 1)]);
}
return response()->json([
'success' => true,
'error' => false,
'data' => $tax,
'message' => $message,
'html' => 'null',
]);
return response()->json($response);
}
}

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

@ -4,7 +4,7 @@ namespace App\Http\Controllers\Modals;
use App\Abstracts\Http\Controller;
use App\Http\Requests\Common\Contact as Request;
use App\Models\Common\Contact;
use App\Jobs\Common\CreateContact;
use App\Models\Setting\Currency;
class Vendors extends Controller
@ -59,16 +59,12 @@ class Vendors extends Controller
{
$request['enabled'] = 1;
$contact = Contact::create($request->all());
$response = $this->ajaxDispatch(new CreateContact($request));
$message = trans('messages.success.added', ['type' => trans_choice('general.vendors', 1)]);
if ($response['success']) {
$response['message'] = trans('messages.success.added', ['type' => trans_choice('general.vendors', 1)]);
}
return response()->json([
'success' => true,
'error' => false,
'data' => $contact,
'message' => $message,
'html' => 'null',
]);
return response()->json($response);
}
}