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

fixed #1156

Browse Source
This commit is contained in:
denisdulici 2020-01-24 16:33:00 +03:00
parent b13f6e2310
commit 1fa2848f89
4 changed files with 371 additions and 370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
modules/OfflinePayments/Http/Controllers/Settings.php
View File

@ -18,9 +18,9 @@ class Settings extends Controller
*/ */
public function edit() public function edit()
{ {
$items = json_decode(setting('offline-payments.methods')); $methods = json_decode(setting('offline-payments.methods'));
return view('offline-payments::edit', compact('items')); return view('offline-payments::edit', compact('methods'));
} }
/** /**
@ -34,35 +34,36 @@ class Settings extends Controller
{ {
$methods = json_decode(setting('offline-payments.methods'), true); $methods = json_decode(setting('offline-payments.methods'), true);
if (isset($request['method'])) { if (isset($request['update_code'])) {
foreach ($methods as $key => $method) { foreach ($methods as $key => $method) {
if ($method['code'] != $request['method']) { if ($method['code'] != $request['update_code']) {
continue; continue;
} }
$method = explode('.', $request['method']); $method = explode('.', $request['update_code']);
$methods[$key]['code'] = 'offline-payments.' . $request['code'] . '.' . $method[2]; $methods[$key] = [
$methods[$key]['name'] = $request['name']; 'code' => 'offline-payments.' . $request['code'] . '.' . $method[2],
$methods[$key]['customer'] = $request['customer']; 'name' => $request['name'],
$methods[$key]['order'] = $request['order']; 'customer' => $request['customer'],
$methods[$key]['description'] = $request['description']; 'order' => $request['order'],
'description' => $request['description'],
];
} }
$message = trans('messages.success.updated', ['type' => $request['name']]); $message = trans('messages.success.updated', ['type' => $request['name']]);
} else { } else {
$methods[] = array( $methods[] = [
'code' => 'offline-payments.' . $request['code'] . '.' . (count($methods) + 1), 'code' => 'offline-payments.' . $request['code'] . '.' . (count($methods) + 1),
'name' => $request['name'], 'name' => $request['name'],
'customer' => $request['customer'], 'customer' => $request['customer'],
'order' => $request['order'], 'order' => $request['order'],
'description' => $request['description'] 'description' => $request['description'],
); ];
$message = trans('messages.success.added', ['type' => $request['name']]); $message = trans('messages.success.added', ['type' => $request['name']]);
} }
// Set Api Token
setting()->set('offline-payments.methods', json_encode($methods)); setting()->set('offline-payments.methods', json_encode($methods));
setting()->save(); setting()->save();
@ -75,7 +76,7 @@ class Settings extends Controller
'error' => false, 'error' => false,
'message' => $message, 'message' => $message,
'data' => null, 'data' => null,
'redirect' => route('offline-payments.edit'), 'redirect' => route('offline-payments.settings.edit'),
]; ];
flash($message)->success(); flash($message)->success();
@ -104,7 +105,7 @@ class Settings extends Controller
} }
$method['title'] = trans('offline-payments::offline-payments.edit', ['method' => $method['name']]); $method['title'] = trans('offline-payments::offline-payments.edit', ['method' => $method['name']]);
$method['update'] = $code; $method['update_code'] = $code;
$code = explode('.', $method['code']); $code = explode('.', $method['code']);
@ -118,7 +119,7 @@ class Settings extends Controller
return response()->json([ return response()->json([
'errors' => false, 'errors' => false,
'success' => true, 'success' => true,
'data' => $data 'data' => $data,
]); ]);
} }
@ -161,7 +162,7 @@ class Settings extends Controller
'errors' => false, 'errors' => false,
'success' => true, 'success' => true,
'message' => $message, 'message' => $message,
'redirect' => route('offline-payments.edit'), 'redirect' => route('offline-payments.settings.edit'),
]); ]);
} }
} }

6
modules/OfflinePayments/Resources/assets/js/offline-payments.js vendored
View File

@ -39,7 +39,7 @@ const app = new Vue({
this.form.loading = true; this.form.loading = true;
axios.post('offline-payments/settings/get', { axios.post('settings/get', {
code: code code: code
}) })
.then(response => { .then(response => {
@ -48,7 +48,7 @@ const app = new Vue({
this.form.customer = response.data.data.customer; this.form.customer = response.data.data.customer;
this.form.order = response.data.data.order; this.form.order = response.data.data.order;
this.form.description = response.data.data.description; this.form.description = response.data.data.description;
this.form.update = response.data.data.update; this.form.update_code = response.data.data.update_code;
this.form.loading = false; this.form.loading = false;
}) })
.catch(error => { .catch(error => {
@ -76,7 +76,7 @@ const app = new Vue({
onDelete() { onDelete() {
axios({ axios({
method: 'DELETE', method: 'DELETE',
url: 'offline-payments/settings/delete', url: 'settings/delete',
data: { data: {
code: this.confirm.code code: this.confirm.code
} }

6
modules/OfflinePayments/Resources/assets/js/offline-payments.min.js vendored
View File

@ -129439,7 +129439,7 @@ var app = new vue__WEBPACK_IMPORTED_MODULE_0___default.a({
var code = event.target.dataset.code; var code = event.target.dataset.code;
this.form.loading = true; this.form.loading = true;
axios.post('offline-payments/settings/get', { axios.post('settings/get', {
code: code code: code
}).then(function (response) { }).then(function (response) {
_this.form.name = response.data.data.name; _this.form.name = response.data.data.name;
@ -129447,7 +129447,7 @@ var app = new vue__WEBPACK_IMPORTED_MODULE_0___default.a({
_this.form.customer = response.data.data.customer; _this.form.customer = response.data.data.customer;
_this.form.order = response.data.data.order; _this.form.order = response.data.data.order;
_this.form.description = response.data.data.description; _this.form.description = response.data.data.description;
_this.form.update = response.data.data.update; _this.form.update_code = response.data.data.update_code;
_this.form.loading = false; _this.form.loading = false;
}).catch(function (error) { }).catch(function (error) {
_this.form.loading = false; _this.form.loading = false;
@ -129473,7 +129473,7 @@ var app = new vue__WEBPACK_IMPORTED_MODULE_0___default.a({
axios({ axios({
method: 'DELETE', method: 'DELETE',
url: 'offline-payments/settings/delete', url: 'settings/delete',
data: { data: {
code: this.confirm.code code: this.confirm.code
} }

8
modules/OfflinePayments/Resources/views/edit.blade.php
View File

@ -18,7 +18,7 @@
'files' => true, 'files' => true,
'role' => 'form', 'role' => 'form',
'class' => 'form-loading-button', 'class' => 'form-loading-button',
'novalidate' => true 'novalidate' => true,
]) !!} ]) !!}
<div class="card-body"> <div class="card-body">
@ -33,7 +33,7 @@
{{ Form::textareaGroup('description', trans('general.description')) }} {{ Form::textareaGroup('description', trans('general.description')) }}
{!! Form::hidden('update', null) !!} {!! Form::hidden('update_code', null) !!}
</div> </div>
</div> </div>
@ -65,8 +65,8 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@if($items) @if($methods)
@foreach($items as $item) @foreach($methods as $item)
<tr class="row align-items-center border-top-1" id="method-{{ $item->code }}"> <tr class="row align-items-center border-top-1" id="method-{{ $item->code }}">
<td class="col-xs-6 col-sm-4 col-md-4 col-lg-3">{{ $item->name }}</td> <td class="col-xs-6 col-sm-4 col-md-4 col-lg-3">{{ $item->name }}</td>
<td class="col-sm-4 col-md-4 col-lg-4 hidden-sm">{{ $item->code }}</td> <td class="col-sm-4 col-md-4 col-lg-4 hidden-sm">{{ $item->code }}</td>