diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 2b38ba25d76b..d59604040940 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -122,9 +122,16 @@ class PaymentController extends BaseController public function edit(PaymentRequest $request) { $payment = $request->entity(); - $payment->payment_date = Utils::fromSqlDate($payment->payment_date); + $actions = []; + if ( ! $payment->trashed()) { + $actions[] = ['url' => 'javascript:submitAction("archive")', 'label' => trans('texts.archive_payment')]; + $actions[] = ['url' => 'javascript:onDeleteClick()', 'label' => trans('texts.delete_payment')]; + } else { + $actions[] = ['url' => 'javascript:submitAction("restore")', 'label' => trans('texts.restore_expense')]; + } + $data = [ 'client' => null, 'invoice' => null, @@ -138,6 +145,7 @@ class PaymentController extends BaseController 'method' => 'PUT', 'url' => 'payments/'.$payment->public_id, 'title' => trans('texts.edit_payment'), + 'actions' => $actions, 'paymentTypes' => Cache::get('paymentTypes'), 'clients' => Client::scope()->with('contacts')->orderBy('name')->get(), ]; @@ -173,6 +181,10 @@ class PaymentController extends BaseController */ public function update(UpdatePaymentRequest $request) { + if (in_array($request->action, ['archive', 'delete', 'restore'])) { + return self::bulk(); + } + $payment = $this->paymentRepo->save($request->input(), $request->entity()); Session::flash('message', trans('texts.updated_payment')); @@ -191,7 +203,7 @@ class PaymentController extends BaseController $count = $this->paymentService->bulk($ids, $action, ['amount'=>$amount]); if ($count > 0) { - $message = Utils::pluralize($action=='refund'?'refunded_payment':$action.'d_payment', $count); + $message = Utils::pluralize($action=='refund' ? 'refunded_payment':$action.'d_payment', $count); Session::flash('message', $message); } diff --git a/resources/views/payments/edit.blade.php b/resources/views/payments/edit.blade.php index d476bab5279c..01e0cb924b6d 100644 --- a/resources/views/payments/edit.blade.php +++ b/resources/views/payments/edit.blade.php @@ -15,7 +15,7 @@ @section('content') {!! Former::open($url) - ->addClass('col-md-10 col-md-offset-1 warn-on-exit') + ->addClass('col-md-10 col-md-offset-1 warn-on-exit main-form') ->onsubmit('onFormSubmit(event)') ->method($method) ->rules(array( @@ -30,6 +30,7 @@