v2 first commit

This commit is contained in:
denisdulici
2019-11-16 10:21:14 +03:00
parent 5b23e9c2c4
commit 6d50fa8442
3075 changed files with 3451681 additions and 65594 deletions

View File

@@ -2,11 +2,11 @@
namespace App\Http\Controllers\Wizard;
use App\Http\Controllers\Controller;
use App\Abstracts\Http\Controller;
use App\Http\Requests\Wizard\Company as Request;
use App\Models\Common\Company;
use App\Traits\Uploads;
use Date;
use Illuminate\Support\Str;
class Companies extends Controller
{
@@ -21,8 +21,6 @@ class Companies extends Controller
{
$company = Company::find(session('company_id'));
$company->setSettings();
return view('wizard.companies.edit', compact('company'));
}
@@ -41,7 +39,7 @@ class Companies extends Controller
$fields = $request->all();
$skip_keys = ['company_id', '_method', '_token'];
$file_keys = ['company_logo', 'invoice_logo'];
$file_keys = ['company.logo'];
foreach ($fields as $key => $value) {
// Don't process unwanted keys
@@ -49,13 +47,24 @@ class Companies extends Controller
continue;
}
switch ($key) {
case 'api_key':
$real_key = 'apps.' . $key;
break;
case 'financial_start':
$real_key = 'localisation.' . $key;
break;
default:
$real_key = 'company.' . $key;
}
// Process file uploads
if (in_array($key, $file_keys)) {
if (in_array($real_key, $file_keys)) {
// Upload attachment
if ($request->file($key)) {
$media = $this->getMedia($request->file($key), 'settings');
$company->attachMedia($media, $key);
$company->attachMedia($media, Str::snake($key));
$value = $media->id;
}
@@ -66,12 +75,25 @@ class Companies extends Controller
}
}
setting()->set('general.' . $key, $value);
setting()->set($real_key, $value);
}
// Save all settings
setting()->save();
return redirect('wizard/currencies');
$message = trans('messages.success.updated', ['type' => trans_choice('general.companies', 2)]);
$response = [
'status' => null,
'success' => true,
'error' => false,
'message' => $message,
'data' => null,
'redirect' => route('wizard.currencies.index'),
];
flash($message)->success();
return response()->json($response);
}
}

View File

@@ -3,9 +3,11 @@
namespace App\Http\Controllers\Wizard;
use Akaunting\Money\Currency as MoneyCurrency;
use App\Http\Controllers\Controller;
use App\Abstracts\Http\Controller;
use App\Http\Requests\Setting\Currency as Request;
use App\Models\Banking\Account;
use App\Jobs\Setting\CreateCurrency;
use App\Jobs\Setting\DeleteCurrency;
use App\Jobs\Setting\UpdateCurrency;
use App\Models\Setting\Currency;
class Currencies extends Controller
@@ -17,41 +19,19 @@ class Currencies extends Controller
*/
public function index()
{
$currencies = Currency::all();
$currencies = Currency::collect();
return view('wizard.currencies.index', compact('currencies'));
}
/**
* Show the form for creating a new resource.
*
* @return Response
*/
public function create()
{
// Get current currencies
$current = Currency::pluck('code')->toArray();
$current = Currency::orderBy('code')->pluck('code')->toArray();
// Prepare codes
$codes = array();
$currencies = MoneyCurrency::getCurrencies();
foreach ($currencies as $key => $item) {
// Don't show if already available
if (in_array($key, $current)) {
continue;
}
$money_currencies = MoneyCurrency::getCurrencies();
foreach ($money_currencies as $key => $item) {
$codes[$key] = $key;
}
$html = view('wizard.currencies.create', compact('codes'))->render();
return response()->json([
'success' => true,
'error' => false,
'message' => 'null',
'html' => $html,
]);
return view('wizard.currencies.index', compact('currencies', 'codes'));
}
/**
@@ -63,63 +43,22 @@ class Currencies extends Controller
*/
public function store(Request $request)
{
// Force the rate to be 1 for default currency
if ($request['default_currency']) {
$request['rate'] = '1';
$response = $this->ajaxDispatch(new CreateCurrency($request));
$response['redirect'] = route('wizard.currencies.index');
if ($response['success']) {
$message = trans('messages.success.added', ['type' => trans_choice('general.currencies', 1)]);
flash($message)->success();
} else {
$message = $response['message'];
flash($message)->error();
}
$currency = Currency::create($request->all());
// Update default currency setting
if ($request['default_currency']) {
setting()->set('general.default_currency', $request['code']);
setting()->save();
}
$message = trans('messages.success.added', ['type' => trans_choice('general.currencies', 1)]);
return response()->json([
'success' => true,
'error' => false,
'message' => $message,
'data' => $currency,
]);
}
/**
* Show the form for editing the specified resource.
*
* @param Currency $currency
*
* @return Response
*/
public function edit(Currency $currency)
{
// Get current currencies
$current = Currency::pluck('code')->toArray();
// Prepare codes
$codes = array();
$currencies = MoneyCurrency::getCurrencies();
foreach ($currencies as $key => $item) {
// Don't show if already available
if (($key != $currency->code) && in_array($key, $current)) {
continue;
}
$codes[$key] = $key;
}
$item = $currency;
$html = view('wizard.currencies.edit', compact('item', 'codes'))->render();
return response()->json([
'success' => true,
'error' => false,
'message' => 'null',
'html' => $html,
]);
return response()->json($response);
}
/**
@@ -132,122 +71,21 @@ class Currencies extends Controller
*/
public function update(Currency $currency, Request $request)
{
// Check if we can disable or change the code
if (!$request['enabled'] || ($currency->code != $request['code'])) {
$relationships = $this->countRelationships($currency, [
'accounts' => 'accounts',
'customers' => 'customers',
'invoices' => 'invoices',
'revenues' => 'revenues',
'bills' => 'bills',
'payments' => 'payments',
]);
$response = $this->ajaxDispatch(new UpdateCurrency($currency, $request));
if ($currency->code == setting('general.default_currency')) {
$relationships[] = strtolower(trans_choice('general.companies', 1));
}
}
$response['redirect'] = route('wizard.currencies.index');
if (empty($relationships)) {
// Force the rate to be 1 for default currency
if ($request['default_currency']) {
$request['rate'] = '1';
}
if ($response['success']) {
$message = trans('messages.success.updated', ['type' => $currency->name]);
$currency->update($request->all());
// Update default currency setting
if ($request['default_currency']) {
setting()->set('general.default_currency', $request['code']);
setting()->save();
}
$message = trans('messages.success.updated', ['type' => trans_choice('general.currencies', 1)]);
return response()->json([
'success' => true,
'error' => false,
'message' => $message,
'data' => $currency,
]);
flash($message)->success();
} else {
$message = trans('messages.warning.disabled', ['name' => $currency->name, 'text' => implode(', ', $relationships)]);
$message = $response['message'];
return response()->json([
'success' => true,
'error' => false,
'message' => $message,
'data' => $currency,
]);
}
}
/**
* Enable the specified resource.
*
* @param Currency $currency
*
* @return Response
*/
public function enable(Currency $currency)
{
$currency->enabled = 1;
$currency->save();
$message = trans('messages.success.enabled', ['type' => trans_choice('general.currencies', 1)]);
return response()->json([
'success' => true,
'error' => false,
'message' => $message,
'data' => $currency,
]);
}
/**
* Disable the specified resource.
*
* @param Currency $currency
*
* @return Response
*/
public function disable(Currency $currency)
{
$relationships = $this->countRelationships($currency, [
'accounts' => 'accounts',
'customers' => 'customers',
'invoices' => 'invoices',
'revenues' => 'revenues',
'bills' => 'bills',
'payments' => 'payments',
]);
if ($currency->code == setting('general.default_currency')) {
$relationships[] = strtolower(trans_choice('general.companies', 1));
flash($message)->error();
}
if (empty($relationships)) {
$currency->enabled = 0;
$currency->save();
$message = trans('messages.success.disabled', ['type' => trans_choice('general.currencies', 1)]);
return response()->json([
'success' => true,
'error' => false,
'message' => $message,
'data' => $currency,
]);
} else {
$message = trans('messages.warning.disabled', ['name' => $currency->name, 'text' => implode(', ', $relationships)]);
return response()->json([
'success' => false,
'error' => true,
'message' => $message,
'data' => $currency,
]);
}
return response()->json($response);
}
/**
@@ -259,39 +97,20 @@ class Currencies extends Controller
*/
public function destroy(Currency $currency)
{
$relationships = $this->countRelationships($currency, [
'accounts' => 'accounts',
'customers' => 'customers',
'invoices' => 'invoices',
'revenues' => 'revenues',
'bills' => 'bills',
'payments' => 'payments',
]);
$response = $this->ajaxDispatch(new DeleteCurrency($currency));
if ($currency->code == setting('general.default_currency')) {
$relationships[] = strtolower(trans_choice('general.companies', 1));
}
$response['redirect'] = route('wizard.currencies.index');
if (empty($relationships)) {
$currency->delete();
if ($response['success']) {
$message = trans('messages.success.deleted', ['type' => $currency->name]);
$message = trans('messages.success.deleted', ['type' => trans_choice('general.currencies', 1)]);
return response()->json([
'success' => true,
'error' => false,
'message' => $message,
'data' => $currency,
]);
flash($message)->success();
} else {
$message = trans('messages.warning.deleted', ['name' => $currency->name, 'text' => implode(', ', $relationships)]);
$message = $response['message'];
return response()->json([
'success' => false,
'error' => true,
'message' => $message,
'data' => $currency,
]);
flash($message)->error();
}
return response()->json($response);
}
}

View File

@@ -17,7 +17,7 @@ class Finish extends Controller
*/
public function index()
{
setting()->set('general.wizard', true);
setting()->set('wizard.completed', 1);
// Save all settings
setting()->save();

View File

@@ -2,8 +2,11 @@
namespace App\Http\Controllers\Wizard;
use App\Http\Controllers\Controller;
use App\Abstracts\Http\Controller;
use App\Http\Requests\Setting\Tax as Request;
use App\Jobs\Setting\CreateTax;
use App\Jobs\Setting\DeleteTax;
use App\Jobs\Setting\UpdateTax;
use App\Models\Setting\Tax;
class Taxes extends Controller
@@ -15,28 +18,11 @@ class Taxes extends Controller
*/
public function index()
{
$taxes = Tax::all();
$taxes = Tax::collect();
return view('wizard.taxes.index', compact('taxes'));
}
/**
* Show the form for creating a new resource.
*
* @return Response
*/
public function create()
{
$html = view('wizard.taxes.create')->render();
return response()->json([
'success' => true,
'error' => false,
'message' => 'null',
'html' => $html,
]);
}
/**
* Store a newly created resource in storage.
*
@@ -46,37 +32,21 @@ class Taxes extends Controller
*/
public function store(Request $request)
{
$tax = Tax::create($request->all());
$response = $this->ajaxDispatch(new CreateTax($request));
$message = trans('messages.success.added', ['type' => trans_choice('general.tax_rates', 1)]);
$response['redirect'] = route('wizard.taxes.index');
return response()->json([
'success' => true,
'error' => false,
'message' => $message,
'data' => $tax,
]);
}
if ($response['success']) {
$message = trans('messages.success.added', ['type' => trans_choice('general.taxes', 1)]);
/**
* Show the form for editing the specified resource.
*
* @param Tax $tax
*
* @return Response
*/
public function edit(Tax $tax)
{
$item = $tax;
flash($message)->success();
} else {
$message = $response['message'];
$html = view('wizard.taxes.edit', compact('item'))->render();
flash($message)->error();
}
return response()->json([
'success' => true,
'error' => false,
'message' => 'null',
'html' => $html,
]);
return response()->json($response);
}
/**
@@ -89,94 +59,21 @@ class Taxes extends Controller
*/
public function update(Tax $tax, Request $request)
{
$relationships = $this->countRelationships($tax, [
'items' => 'items',
'invoice_items' => 'invoices',
'bill_items' => 'bills',
]);
$response = $this->ajaxDispatch(new UpdateTax($tax, $request));
if (empty($relationships) || $request['enabled']) {
$tax->update($request->all());
$response['redirect'] = route('wizard.taxes.index');
$message = trans('messages.success.updated', ['type' => trans_choice('general.tax_rates', 1)]);
if ($response['success']) {
$message = trans('messages.success.updated', ['type' => $tax->name]);
return response()->json([
'success' => true,
'error' => false,
'message' => $message,
'data' => $tax,
]);
flash($message)->success();
} else {
$message = trans('messages.warning.disabled', ['name' => $tax->name, 'text' => implode(', ', $relationships)]);
$message = $response['message'];
return response()->json([
'success' => true,
'error' => false,
'message' => $message,
'data' => $tax,
]);
flash($message)->error();
}
}
/**
* Enable the specified resource.
*
* @param Tax $tax
*
* @return Response
*/
public function enable(Tax $tax)
{
$tax->enabled = 1;
$tax->save();
$message = trans('messages.success.enabled', ['type' => trans_choice('general.tax_rates', 1)]);
return response()->json([
'success' => true,
'error' => false,
'message' => $message,
'data' => $tax,
]);
}
/**
* Disable the specified resource.
*
* @param Tax $tax
*
* @return Response
*/
public function disable(Tax $tax)
{
$relationships = $this->countRelationships($tax, [
'items' => 'items',
'invoice_items' => 'invoices',
'bill_items' => 'bills',
]);
if (empty($relationships)) {
$tax->enabled = 0;
$tax->save();
$message = trans('messages.success.disabled', ['type' => trans_choice('general.tax_rates', 1)]);
return response()->json([
'success' => true,
'error' => false,
'message' => $message,
'data' => $tax,
]);
} else {
$message = trans('messages.warning.disabled', ['name' => $tax->name, 'text' => implode(', ', $relationships)]);
return response()->json([
'success' => false,
'error' => true,
'message' => $message,
'data' => $tax,
]);
}
return response()->json($response);
}
/**
@@ -188,32 +85,20 @@ class Taxes extends Controller
*/
public function destroy(Tax $tax)
{
$relationships = $this->countRelationships($tax, [
'items' => 'items',
'invoice_items' => 'invoices',
'bill_items' => 'bills',
]);
$response = $this->ajaxDispatch(new DeleteTax($tax));
if (empty($relationships)) {
$tax->delete();
$response['redirect'] = route('wizard.taxes.index');
$message = trans('messages.success.deleted', ['type' => trans_choice('general.taxes', 1)]);
if ($response['success']) {
$message = trans('messages.success.deleted', ['type' => $tax->name]);
return response()->json([
'success' => true,
'error' => false,
'message' => $message,
'data' => $tax,
]);
flash($message)->success();
} else {
$message = trans('messages.warning.deleted', ['name' => $tax->name, 'text' => implode(', ', $relationships)]);
$message = $response['message'];
return response()->json([
'success' => false,
'error' => true,
'message' => $message,
'data' => $tax,
]);
flash($message)->error();
}
return response()->json($response);
}
}