diff --git a/app/Models/Service.php b/app/Models/Service.php index a6dd968..8ae2b81 100644 --- a/app/Models/Service.php +++ b/app/Models/Service.php @@ -1152,7 +1152,6 @@ class Service extends Model )) { do { - dump(['next'=>$this->invoice_next,'stop'=>$this->invoice_next_end]); $o = new InvoiceItem; $o->active = TRUE; $o->service_id = $this->id; diff --git a/app/User.php b/app/User.php index 4d3fc55..09beaea 100644 --- a/app/User.php +++ b/app/User.php @@ -462,7 +462,7 @@ class User extends Authenticatable public function client_service_movements(): DatabaseCollection { return Service::active() - ->select(['id','account_id','product_id','order_status','model']) + ->select(['id','account_id','product_id','order_status','model','order_info']) ->where('order_status','!=','ACTIVE') ->whereIN('account_id',$this->all_accounts()->pluck('id')->unique()->toArray()) ->with(['account','product']) diff --git a/database/migrations/2020_04_22_231133_change_service_number_adsl.php b/database/migrations/2020_04_22_231133_change_service_number_adsl.php new file mode 100644 index 0000000..63a774a --- /dev/null +++ b/database/migrations/2020_04_22_231133_change_service_number_adsl.php @@ -0,0 +1,28 @@ +{{ $o->id }} {{ $o->account->name }} {{ $o->name_short }} - {{ $o->status }} + + {{ $o->status }} + @if ($o->status == 'ORDER-SENT') + (#{{$o->order_info_reference}}) + @endif + {{ $o->product->name }} @endforeach diff --git a/resources/views/theme/backend/adminlte/u/service/widgets/information.blade.php b/resources/views/theme/backend/adminlte/u/service/widgets/information.blade.php index 21c5688..8b70139 100644 --- a/resources/views/theme/backend/adminlte/u/service/widgets/information.blade.php +++ b/resources/views/theme/backend/adminlte/u/service/widgets/information.blade.php @@ -21,6 +21,12 @@ Status {!! $o->status_html !!} + @if ($o->order_status == 'ORDER-SENT') + + Order Reference + {{ $o->order_info_reference ?? '' }} + + @endif @if ($o->date_end) Cancellation Date