From 5a036cdc6460eded0c7c521901d71ce9e31529c9 Mon Sep 17 00:00:00 2001 From: Deon George Date: Thu, 24 Jan 2019 22:03:43 +1100 Subject: [PATCH] Added Order Hold/Release --- app/Http/Controllers/AdminHomeController.php | 5 +++++ app/Models/Service.php | 2 +- resources/theme/backend/adminlte/a/service.blade.php | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/AdminHomeController.php b/app/Http/Controllers/AdminHomeController.php index 19b8818..59344f5 100644 --- a/app/Http/Controllers/AdminHomeController.php +++ b/app/Http/Controllers/AdminHomeController.php @@ -49,6 +49,11 @@ class AdminHomeController extends Controller $o->nextStatus($action); break; + case 'hold': + case 'release': + $o->nextStatus($action); + break; + case 'update_reference': $o->order_info = array_merge($o->order_info ? $o->order_info : [],['order_reference'=>$request->input('notes')]); $o->save(); diff --git a/app/Models/Service.php b/app/Models/Service.php index d75d038..53db688 100644 --- a/app/Models/Service.php +++ b/app/Models/Service.php @@ -59,7 +59,7 @@ class Service extends Model // Order Submitted 'ORDER-SUBMIT' => ['approve'=>'ORDER-SENT','hold'=>'ORDER-HOLD','reject'=>'ORDER-REJECTED','cancel'=>'ORDER-CANCELLED'], // Order On Hold (Reason) - 'ORDER-HOLD' => [], + 'ORDER-HOLD' => ['release'=>'ORDER-SUBMIT','update_reference'=>'ORDER-SENT'], // Order Rejected (Reason) 'ORDER-REJECTED' => [], // Order Cancelled diff --git a/resources/theme/backend/adminlte/a/service.blade.php b/resources/theme/backend/adminlte/a/service.blade.php index 5137c4b..484279d 100644 --- a/resources/theme/backend/adminlte/a/service.blade.php +++ b/resources/theme/backend/adminlte/a/service.blade.php @@ -28,6 +28,7 @@ @include('a.widgets.service.order.submit') @break + @case('ORDER-HOLD') @case('ORDER-SENT') @case('ORDERED') @include('a.widgets.service.order.sent') @@ -49,9 +50,12 @@ @switch($o->order_status) @case('ORDER-SUBMIT') + @break; + @case('ORDER-HOLD') + @case('ORDER-SENT') @case('ORDERED')