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

import validation fixed create and edit action on invoice, bill, revenue, payment.

Browse Source 
refs #392
This commit is contained in:
cuneytsenturk
2018-06-25 17:53:43 +03:00
parent 409f83ae54
commit 55ac8447fc
16 changed files with 154 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Banking/Accounts.php
View File

@@ -208,4 +208,18 @@ class Accounts extends Controller
return redirect('banking/accounts');
}
public function currency()
{
$account_id = request('account_id');
$account = Account::find($account_id);
// Get currency object
$currency = Currency::where('code', $account->currency_code)->first();
$account->currency_rate = $currency->rate;
return response()->json($account);
}
}

34
app/Http/Controllers/Expenses/Bills.php
View File

@@ -117,25 +117,6 @@ class Bills extends Controller
*/
public function store(Request $request)
{
// Get vendor object
$vendor = Vendor::findOrFail($request['vendor_id']);
$request['vendor_name'] = $vendor->name;
$request['vendor_email'] = $vendor->email;
$request['vendor_tax_number'] = $vendor->tax_number;
$request['vendor_phone'] = $vendor->phone;
$request['vendor_address'] = $vendor->address;
// Get currency object
$currency = Currency::where('code', $request['currency_code'])->first();
$request['currency_code'] = $currency->code;
$request['currency_rate'] = $currency->rate;
$request['bill_status_code'] = 'draft';
$request['amount'] = 0;
$bill = Bill::create($request->input());
// Upload attachment
@@ -346,21 +327,6 @@ class Bills extends Controller
*/
public function update(Bill $bill, Request $request)
{
// Get vendor object
$vendor = Vendor::findOrFail($request['vendor_id']);
$request['vendor_name'] = $vendor->name;
$request['vendor_email'] = $vendor->email;
$request['vendor_tax_number'] = $vendor->tax_number;
$request['vendor_phone'] = $vendor->phone;
$request['vendor_address'] = $vendor->address;
// Get currency object
$currency = Currency::where('code', $request['currency_code'])->first();
$request['currency_code'] = $currency->code;
$request['currency_rate'] = $currency->rate;
$taxes = [];
$tax_total = 0;
$sub_total = 0;

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

@@ -82,12 +82,6 @@ class Payments extends Controller
*/
public function store(Request $request)
{
// Get currency object
$currency = Currency::where('code', $request['currency_code'])->first();
$request['currency_code'] = $currency->code;
$request['currency_rate'] = $currency->rate;
$payment = Payment::create($request->input());
// Upload attachment
@@ -179,12 +173,6 @@ class Payments extends Controller
*/
public function update(Payment $payment, Request $request)
{
// Get currency object
$currency = Currency::where('code', $request['currency_code'])->first();
$request['currency_code'] = $currency->code;
$request['currency_rate'] = $currency->rate;
$payment->update($request->input());
// Upload attachment

5
app/Http/Controllers/Expenses/Vendors.php
View File

@@ -308,6 +308,11 @@ class Vendors extends Controller
$vendor = Vendor::find($vendor_id);
// Get currency object
$currency = Currency::where('code', $vendor->currency_code)->first();
$vendor->currency_rate = $currency->rate;
return response()->json($vendor);
}

5
app/Http/Controllers/Incomes/Customers.php
View File

@@ -344,6 +344,11 @@ class Customers extends Controller
$customer = Customer::find($customer_id);
// Get currency object
$currency = Currency::where('code', $customer->currency_code)->first();
$customer->currency_rate = $currency->rate;
return response()->json($customer);
}

34
app/Http/Controllers/Incomes/Invoices.php
View File

@@ -122,25 +122,6 @@ class Invoices extends Controller
*/
public function store(Request $request)
{
// Get customer object
$customer = Customer::findOrFail($request['customer_id']);
$request['customer_name'] = $customer->name;
$request['customer_email'] = $customer->email;
$request['customer_tax_number'] = $customer->tax_number;
$request['customer_phone'] = $customer->phone;
$request['customer_address'] = $customer->address;
// Get currency object
$currency = Currency::where('code', $request['currency_code'])->first();
$request['currency_code'] = $currency->code;
$request['currency_rate'] = $currency->rate;
$request['invoice_status_code'] = 'draft';
$request['amount'] = 0;
$invoice = Invoice::create($request->input());
// Upload attachment
@@ -367,21 +348,6 @@ class Invoices extends Controller
*/
public function update(Invoice $invoice, Request $request)
{
// Get customer object
$customer = Customer::findOrFail($request['customer_id']);
$request['customer_name'] = $customer->name;
$request['customer_email'] = $customer->email;
$request['customer_tax_number'] = $customer->tax_number;
$request['customer_phone'] = $customer->phone;
$request['customer_address'] = $customer->address;
// Get currency object
$currency = Currency::where('code', $request['currency_code'])->first();
$request['currency_code'] = $currency->code;
$request['currency_rate'] = $currency->rate;
$taxes = [];
$tax_total = 0;
$sub_total = 0;

12
app/Http/Controllers/Incomes/Revenues.php
View File

@@ -84,12 +84,6 @@ class Revenues extends Controller
*/
public function store(Request $request)
{
// Get currency object
$currency = Currency::where('code', $request['currency_code'])->first();
$request['currency_code'] = $currency->code;
$request['currency_rate'] = $currency->rate;
$revenue = Revenue::create($request->input());
// Upload attachment
@@ -181,12 +175,6 @@ class Revenues extends Controller
*/
public function update(Revenue $revenue, Request $request)
{
// Get currency
$currency = Currency::where('code', $request['currency_code'])->first();
$request['currency_code'] = $currency->code;
$request['currency_rate'] = $currency->rate;
$revenue->update($request->input());
// Upload attachment