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

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