@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('group_features', function (Blueprint $table) { |
|
| 15 | + Schema::create('group_features', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | 17 | $table->integer('group_id')->unsigned(); |
| 18 | 18 | $table->foreign('group_id')->references('id')->on('product_groups'); |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('widgets', function (Blueprint $table) { |
|
| 15 | + Schema::create('widgets', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | 17 | $table->string('name'); |
| 18 | 18 | $table->string('type'); |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('promotion_types', function (Blueprint $table) { |
|
| 15 | + Schema::create('promotion_types', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | 17 | $table->string('name'); |
| 18 | 18 | $table->timestamps(); |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('plans', function (Blueprint $table) { |
|
| 15 | + Schema::create('plans', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | 17 | $table->string('name'); |
| 18 | 18 | $table->string('description'); |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('promo_product_relations', function (Blueprint $table) { |
|
| 15 | + Schema::create('promo_product_relations', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | 17 | $table->integer('promotion_id')->unsigned(); |
| 18 | 18 | $table->foreign('promotion_id')->references('id')->on('promotions'); |
@@ -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 | */ |
@@ -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') |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use App\Http\Controllers\Controller; |
| 6 | 6 | use App\Model\Licence\LicencedOrganization; |
| 7 | 7 | use App\Organization; |
| 8 | -use Illuminate\Http\Request; |
|
| 9 | 8 | |
| 10 | 9 | class LicenceOrderController extends Controller |
| 11 | 10 | { |
@@ -36,13 +36,13 @@ |
||
| 36 | 36 | public function GetOrders() |
| 37 | 37 | { |
| 38 | 38 | return \Datatable::collection($this->LicencedOrg->get()) |
| 39 | - ->addColumn('organization', function ($model) { |
|
| 39 | + ->addColumn('organization', function($model) { |
|
| 40 | 40 | $org = $this->org->where('id', $model->organization_id)->first(); |
| 41 | 41 | |
| 42 | 42 | return '<a href='.url('organization/'.$org->id).'>'.ucfirst($org->name).'</a>'; |
| 43 | 43 | }) |
| 44 | 44 | ->showColumns('licence_name', 'licence_description', 'number_of_sla', 'price', 'payment_status') |
| 45 | - ->addColumn('action', function ($model) { |
|
| 45 | + ->addColumn('action', function($model) { |
|
| 46 | 46 | return '<a href='.url('licence-orders/'.$model->id.'/edit')." class='btn btn-sm btn-primary'>Edit</a>"; |
| 47 | 47 | }) |
| 48 | 48 | |
@@ -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 | */ |
@@ -33,11 +33,11 @@ |
||
| 33 | 33 | public function GetCurrency() |
| 34 | 34 | { |
| 35 | 35 | return \Datatable::collection($this->currency->select('name', 'id')->where('id', '!=', 1)->get()) |
| 36 | - ->addColumn('#', function ($model) { |
|
| 36 | + ->addColumn('#', function($model) { |
|
| 37 | 37 | return "<input type='checkbox' value=".$model->id.' name=select[] id=check>'; |
| 38 | 38 | }) |
| 39 | 39 | ->showColumns('name', 'base_conversion') |
| 40 | - ->addColumn('action', function ($model) { |
|
| 40 | + ->addColumn('action', function($model) { |
|
| 41 | 41 | //return "<a href=" . url('products/' . $model->id . '/edit') . " class='btn btn-sm btn-primary'>Edit</a>"; |
| 42 | 42 | //return "<a href=#create class='btn btn-primary pull-right' data-toggle=modal data-target=#edit".$model->id.">".\Lang::get('message.create')."</a>". include base_path(). '/resources/views/themes/default1/payment/currency/edit.blade.php'; |
| 43 | 43 | |
@@ -4,11 +4,9 @@ |
||
| 4 | 4 | |
| 5 | 5 | use App\Http\Controllers\Controller; |
| 6 | 6 | use App\Http\Requests\Product\AddonRequest; |
| 7 | -use App\Model\Payment\Plan; |
|
| 8 | 7 | use App\Model\Product\Addon; |
| 9 | 8 | use App\Model\Product\Product; |
| 10 | 9 | use App\Model\Product\ProductAddonRelation; |
| 11 | -use App\Model\Product\Subscription; |
|
| 12 | 10 | use Illuminate\Http\Request; |
| 13 | 11 | |
| 14 | 12 | class AddonController extends Controller |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | /** |
| 84 | 84 | * Store a newly created resource in storage. |
| 85 | 85 | * |
| 86 | - * @return Response |
|
| 86 | + * @return \Illuminate\Http\RedirectResponse |
|
| 87 | 87 | */ |
| 88 | 88 | public function store(ClientRequest $request) |
| 89 | 89 | { |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | * |
| 144 | 144 | * @param int $id |
| 145 | 145 | * |
| 146 | - * @return Response |
|
| 146 | + * @return \Illuminate\Http\RedirectResponse |
|
| 147 | 147 | */ |
| 148 | 148 | public function update($id, ClientRequest $request) |
| 149 | 149 | { |
@@ -156,7 +156,6 @@ discard block |
||
| 156 | 156 | /** |
| 157 | 157 | * Remove the specified resource from storage. |
| 158 | 158 | * |
| 159 | - * @param int $id |
|
| 160 | 159 | * |
| 161 | 160 | * @return Response |
| 162 | 161 | */ |
@@ -42,11 +42,11 @@ discard block |
||
| 42 | 42 | public function GetAddons() |
| 43 | 43 | { |
| 44 | 44 | return \Datatable::collection($this->addon->get()) |
| 45 | - ->addColumn('#', function ($model) { |
|
| 45 | + ->addColumn('#', function($model) { |
|
| 46 | 46 | return "<input type='checkbox' value=".$model->id.' name=select[] id=check>'; |
| 47 | 47 | }) |
| 48 | 48 | ->showColumns('name', 'regular_price', 'selling_price') |
| 49 | - ->addColumn('associated', function ($model) { |
|
| 49 | + ->addColumn('associated', function($model) { |
|
| 50 | 50 | $relations = new ProductAddonRelation(); |
| 51 | 51 | $relations = $relations->where('addon_id', $model->id)->get(); |
| 52 | 52 | $products = []; |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | |
| 57 | 57 | return implode(',', $products); |
| 58 | 58 | }) |
| 59 | - ->addColumn('action', function ($model) { |
|
| 59 | + ->addColumn('action', function($model) { |
|
| 60 | 60 | return '<a href='.url('addons/'.$model->id.'/edit')." class='btn btn-sm btn-primary'>Edit</a>"; |
| 61 | 61 | }) |
| 62 | 62 | ->searchColumns('name') |