@@ -92,7 +92,6 @@ |
||
| 92 | 92 | /** |
| 93 | 93 | * Remove the specified resource from storage. |
| 94 | 94 | * |
| 95 | - * @param int $id |
|
| 96 | 95 | * |
| 97 | 96 | * @return Response |
| 98 | 97 | */ |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | /** |
| 114 | 114 | * Store a newly created resource in storage. |
| 115 | 115 | * |
| 116 | - * @return Response |
|
| 116 | + * @return \Illuminate\Http\RedirectResponse |
|
| 117 | 117 | */ |
| 118 | 118 | public function store(Request $request) |
| 119 | 119 | { |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | * |
| 156 | 156 | * @param int $id |
| 157 | 157 | * |
| 158 | - * @return Response |
|
| 158 | + * @return \Illuminate\Http\RedirectResponse|null |
|
| 159 | 159 | */ |
| 160 | 160 | public function update($id, Request $request) |
| 161 | 161 | { |
@@ -171,7 +171,6 @@ discard block |
||
| 171 | 171 | /** |
| 172 | 172 | * Remove the specified resource from storage. |
| 173 | 173 | * |
| 174 | - * @param int $id |
|
| 175 | 174 | * |
| 176 | 175 | * @return Response |
| 177 | 176 | */ |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | /** |
| 100 | 100 | * Store a newly created resource in storage. |
| 101 | 101 | * |
| 102 | - * @return Response |
|
| 102 | + * @return \Illuminate\Http\RedirectResponse |
|
| 103 | 103 | */ |
| 104 | 104 | public function store(PromotionRequest $request) |
| 105 | 105 | { |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | * |
| 170 | 170 | * @param int $id |
| 171 | 171 | * |
| 172 | - * @return Response |
|
| 172 | + * @return \Illuminate\Http\RedirectResponse |
|
| 173 | 173 | */ |
| 174 | 174 | public function update($id, PromotionRequest $request) |
| 175 | 175 | { |
@@ -196,7 +196,6 @@ discard block |
||
| 196 | 196 | /** |
| 197 | 197 | * Remove the specified resource from storage. |
| 198 | 198 | * |
| 199 | - * @param int $id |
|
| 200 | 199 | * |
| 201 | 200 | * @return Response |
| 202 | 201 | */ |
@@ -58,14 +58,14 @@ discard block |
||
| 58 | 58 | public function GetPromotion() |
| 59 | 59 | { |
| 60 | 60 | return \Datatable::collection($this->promotion->select('code', 'type', 'id')->get()) |
| 61 | - ->addColumn('#', function ($model) { |
|
| 61 | + ->addColumn('#', function($model) { |
|
| 62 | 62 | return "<input type='checkbox' value=".$model->id.' name=select[] id=check>'; |
| 63 | 63 | }) |
| 64 | 64 | ->showColumns('code') |
| 65 | - ->addColumn('type', function ($model) { |
|
| 65 | + ->addColumn('type', function($model) { |
|
| 66 | 66 | return $this->type->where('id', $model->type)->first()->name; |
| 67 | 67 | }) |
| 68 | - ->addColumn('products', function ($model) { |
|
| 68 | + ->addColumn('products', function($model) { |
|
| 69 | 69 | $selected = $this->promoRelation->select('product_id')->where('promotion_id', $model->id)->get(); |
| 70 | 70 | |
| 71 | 71 | foreach ($selected as $key => $select) { |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | return 'None'; |
| 78 | 78 | } |
| 79 | 79 | }) |
| 80 | - ->addColumn('action', function ($model) { |
|
| 80 | + ->addColumn('action', function($model) { |
|
| 81 | 81 | return '<a href='.url('promotions/'.$model->id.'/edit')." class='btn btn-sm btn-primary'>Edit</a>"; |
| 82 | 82 | }) |
| 83 | 83 | ->searchColumns('products') |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | /** |
| 93 | 93 | * Store a newly created resource in storage. |
| 94 | 94 | * |
| 95 | - * @return Response |
|
| 95 | + * @return \Illuminate\Http\RedirectResponse |
|
| 96 | 96 | */ |
| 97 | 97 | public function store(TaxRequest $request) |
| 98 | 98 | { |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | * |
| 141 | 141 | * @param int $id |
| 142 | 142 | * |
| 143 | - * @return Response |
|
| 143 | + * @return \Illuminate\Http\RedirectResponse |
|
| 144 | 144 | */ |
| 145 | 145 | public function update($id, Request $request) |
| 146 | 146 | { |
@@ -157,7 +157,6 @@ discard block |
||
| 157 | 157 | /** |
| 158 | 158 | * Remove the specified resource from storage. |
| 159 | 159 | * |
| 160 | - * @param int $id |
|
| 161 | 160 | * |
| 162 | 161 | * @return Response |
| 163 | 162 | */ |
@@ -8,7 +8,6 @@ |
||
| 8 | 8 | use App\Model\Payment\PromotionType; |
| 9 | 9 | use App\Model\Product\Product; |
| 10 | 10 | use App\Model\Product\ProductGroup; |
| 11 | -use App\Model\Product\Subscription; |
|
| 12 | 11 | use App\Model\Product\Type; |
| 13 | 12 | use Illuminate\Database\Eloquent\Model; |
| 14 | 13 | use Illuminate\Database\Seeder; |
@@ -296,7 +296,7 @@ |
||
| 296 | 296 | * @param string $path |
| 297 | 297 | * @param array $parameters |
| 298 | 298 | * |
| 299 | - * @return array|object |
|
| 299 | + * @return resource |
|
| 300 | 300 | */ |
| 301 | 301 | private function http($method, $host, $path, array $parameters) |
| 302 | 302 | { |
@@ -31,14 +31,14 @@ |
||
| 31 | 31 | public function GetPages() |
| 32 | 32 | { |
| 33 | 33 | return \Datatable::collection($this->page->get()) |
| 34 | - ->addColumn('#', function ($model) { |
|
| 34 | + ->addColumn('#', function($model) { |
|
| 35 | 35 | return "<input type='checkbox' value=".$model->id.' name=select[] id=check>'; |
| 36 | 36 | }) |
| 37 | 37 | ->showColumns('name', 'url', 'created_at') |
| 38 | - ->addColumn('content', function ($model) { |
|
| 38 | + ->addColumn('content', function($model) { |
|
| 39 | 39 | return str_limit($model->content, 10, '...'); |
| 40 | 40 | }) |
| 41 | - ->addColumn('action', function ($model) { |
|
| 41 | + ->addColumn('action', function($model) { |
|
| 42 | 42 | return '<a href='.url('pages/'.$model->id.'/edit')." class='btn btn-sm btn-primary'>Edit</a>"; |
| 43 | 43 | }) |
| 44 | 44 | ->searchColumns('name', 'content') |
@@ -166,7 +166,6 @@ discard block |
||
| 166 | 166 | /** |
| 167 | 167 | * Remove the specified resource from storage. |
| 168 | 168 | * |
| 169 | - * @param int $id |
|
| 170 | 169 | * |
| 171 | 170 | * @return Response |
| 172 | 171 | */ |
@@ -227,6 +226,9 @@ discard block |
||
| 227 | 226 | } |
| 228 | 227 | } |
| 229 | 228 | |
| 229 | + /** |
|
| 230 | + * @param FrontendPage $model |
|
| 231 | + */ |
|
| 230 | 232 | public function Result($search, $model) |
| 231 | 233 | { |
| 232 | 234 | try { |
@@ -239,6 +241,9 @@ discard block |
||
| 239 | 241 | } |
| 240 | 242 | } |
| 241 | 243 | |
| 244 | + /** |
|
| 245 | + * @param string $type |
|
| 246 | + */ |
|
| 242 | 247 | public function transform($type, $data, $trasform = []) |
| 243 | 248 | { |
| 244 | 249 | $config = \Config::get("transform.$type"); |
@@ -60,29 +60,29 @@ |
||
| 60 | 60 | public function GetSlas() |
| 61 | 61 | { |
| 62 | 62 | return \Datatable::collection($this->sla->get()) |
| 63 | - ->addColumn('licence_id', function ($model) { |
|
| 63 | + ->addColumn('licence_id', function($model) { |
|
| 64 | 64 | $licence_name = $this->licence->where('id', $model->licence_id)->first()->name; |
| 65 | 65 | |
| 66 | 66 | return $licence_name; |
| 67 | 67 | }) |
| 68 | 68 | ->showColumns('name', 'description') |
| 69 | - ->addColumn('service', function ($model) { |
|
| 69 | + ->addColumn('service', function($model) { |
|
| 70 | 70 | $serviceid = $this->slaServiceRelation->where('sla_id', $model->id)->first()->service_id; |
| 71 | 71 | |
| 72 | 72 | return $this->service->where('id', $serviceid)->first()->name; |
| 73 | 73 | }) |
| 74 | - ->addColumn('organization_id', function ($model) { |
|
| 74 | + ->addColumn('organization_id', function($model) { |
|
| 75 | 75 | $name = $this->organization->where('id', $model->organization_id)->where('type', 'client')->first()->name; |
| 76 | 76 | |
| 77 | 77 | return $name; |
| 78 | 78 | }) |
| 79 | - ->addColumn('service_provider_id', function ($model) { |
|
| 79 | + ->addColumn('service_provider_id', function($model) { |
|
| 80 | 80 | $name = $this->organization->where('id', $model->service_provider_id)->where('type', 'service_provider')->first()->name; |
| 81 | 81 | |
| 82 | 82 | return $name; |
| 83 | 83 | }) |
| 84 | 84 | ->showColumns('start_date', 'end_date', 'grace_period') |
| 85 | - ->addColumn('action', function ($model) { |
|
| 85 | + ->addColumn('action', function($model) { |
|
| 86 | 86 | return '<a href='.url('slas/'.$model->id.'/edit')." class='btn btn-sm btn-primary'>Edit</a>"; |
| 87 | 87 | }) |
| 88 | 88 | ->searchColumns('name') |
@@ -88,25 +88,25 @@ |
||
| 88 | 88 | public function GetSlas() |
| 89 | 89 | { |
| 90 | 90 | return \Datatable::collection($this->sla->where('service_provider_id', $this->org->id)->get()) |
| 91 | - ->addColumn('licence_id', function ($model) { |
|
| 91 | + ->addColumn('licence_id', function($model) { |
|
| 92 | 92 | $licence_name = $this->licence->where('id', $model->licence_id)->first()->name; |
| 93 | 93 | |
| 94 | 94 | return $licence_name; |
| 95 | 95 | }) |
| 96 | 96 | ->showColumns('name', 'description') |
| 97 | - ->addColumn('service', function ($model) { |
|
| 97 | + ->addColumn('service', function($model) { |
|
| 98 | 98 | $serviceid = $this->slaServiceRelation->where('sla_id', $model->id)->first()->service_id; |
| 99 | 99 | |
| 100 | 100 | return $this->service->where('id', $serviceid)->first()->name; |
| 101 | 101 | }) |
| 102 | - ->addColumn('organization_id', function ($model) { |
|
| 102 | + ->addColumn('organization_id', function($model) { |
|
| 103 | 103 | $name = $this->organization->where('id', $model->organization_id)->where('type', 'client')->first()->name; |
| 104 | 104 | |
| 105 | 105 | return $name; |
| 106 | 106 | }) |
| 107 | 107 | |
| 108 | 108 | ->showColumns('start_date', 'end_date', 'grace_period') |
| 109 | - ->addColumn('action', function ($model) { |
|
| 109 | + ->addColumn('action', function($model) { |
|
| 110 | 110 | return '<a href='.url('slas/'.$model->id.'/edit')." class='btn btn-sm btn-primary'>Edit</a>"; |
| 111 | 111 | }) |
| 112 | 112 | ->searchColumns('name') |