@@ -50,7 +50,7 @@ |
||
| 50 | 50 | */ |
| 51 | 51 | public function startsWith($letter) |
| 52 | 52 | { |
| 53 | - return array_filter($this->items, function ($item) use ($letter) { |
|
| 53 | + return array_filter($this->items, function($item) use ($letter) { |
|
| 54 | 54 | return stripos($item, $letter) === 0; |
| 55 | 55 | }); |
| 56 | 56 | } |
@@ -17,8 +17,8 @@ discard block |
||
| 17 | 17 | \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class, |
| 18 | 18 | \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, |
| 19 | 19 | // \App\Http\Middleware\TrimStrings::class, |
| 20 | - \Illuminate\Session\Middleware\StartSession::class, |
|
| 21 | - \Illuminate\View\Middleware\ShareErrorsFromSession::class, |
|
| 20 | + \Illuminate\Session\Middleware\StartSession::class, |
|
| 21 | + \Illuminate\View\Middleware\ShareErrorsFromSession::class, |
|
| 22 | 22 | // \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, |
| 23 | 23 | ]; |
| 24 | 24 | |
@@ -29,21 +29,21 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | protected $middlewareGroups = [ |
| 31 | 31 | 'web' => [ |
| 32 | - \App\Http\Middleware\Install::class, |
|
| 32 | + \App\Http\Middleware\Install::class, |
|
| 33 | 33 | \App\Http\Middleware\EncryptCookies::class, |
| 34 | 34 | \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, |
| 35 | 35 | // \Illuminate\Session\Middleware\StartSession::class, |
| 36 | 36 | // \Illuminate\Session\Middleware\AuthenticateSession::class, |
| 37 | 37 | // \Illuminate\View\Middleware\ShareErrorsFromSession::class, |
| 38 | - // \App\Http\Middleware\VerifyCsrfToken::class, |
|
| 38 | + // \App\Http\Middleware\VerifyCsrfToken::class, |
|
| 39 | 39 | \Illuminate\Routing\Middleware\SubstituteBindings::class, |
| 40 | 40 | |
| 41 | - // \App\Http\Middleware\IsInstalled::class, |
|
| 41 | + // \App\Http\Middleware\IsInstalled::class, |
|
| 42 | 42 | |
| 43 | 43 | ], |
| 44 | - 'admin' => [\App\Http\Middleware\Admin::class], |
|
| 45 | - 'guest' => [\App\Http\Middleware\RedirectIfAuthenticated::class], |
|
| 46 | - 'auth' => [\Illuminate\Auth\Middleware\Authenticate::class], |
|
| 44 | + 'admin' => [\App\Http\Middleware\Admin::class], |
|
| 45 | + 'guest' => [\App\Http\Middleware\RedirectIfAuthenticated::class], |
|
| 46 | + 'auth' => [\Illuminate\Auth\Middleware\Authenticate::class], |
|
| 47 | 47 | 'auth.basic' => [\Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class], |
| 48 | 48 | |
| 49 | 49 | 'api' => [ |
@@ -593,7 +593,7 @@ |
||
| 593 | 593 | return redirect()->back()->with('fails', 'Can not delete'); |
| 594 | 594 | } |
| 595 | 595 | |
| 596 | - return redirect()->back()->with('success', "Order $order->number has Deleted Successfully"); |
|
| 596 | + return redirect()->back()->with('success', "order $order->number has Deleted Successfully"); |
|
| 597 | 597 | } catch (\Exception $e) { |
| 598 | 598 | Bugsnag::notifyException($e); |
| 599 | 599 | |
@@ -142,36 +142,36 @@ |
||
| 142 | 142 | return $url; |
| 143 | 143 | }) |
| 144 | 144 | |
| 145 | - ->filterColumn('created_at', function ($query, $keyword) { |
|
| 146 | - $sql = 'created_at like ?'; |
|
| 147 | - $query->whereRaw($sql, ["%{$keyword}%"]); |
|
| 148 | - }) |
|
| 149 | - |
|
| 150 | - ->filterColumn('client', function ($query, $keyword) { |
|
| 151 | - $sql = 'client like ?'; |
|
| 152 | - $query->whereRaw($sql, ["%{$keyword}%"]); |
|
| 153 | - }) |
|
| 154 | - |
|
| 155 | - ->filterColumn('number', function ($query, $keyword) { |
|
| 156 | - $sql = 'number like ?'; |
|
| 157 | - $query->whereRaw($sql, ["%{$keyword}%"]); |
|
| 158 | - }) |
|
| 145 | + ->filterColumn('created_at', function ($query, $keyword) { |
|
| 146 | + $sql = 'created_at like ?'; |
|
| 147 | + $query->whereRaw($sql, ["%{$keyword}%"]); |
|
| 148 | + }) |
|
| 149 | + |
|
| 150 | + ->filterColumn('client', function ($query, $keyword) { |
|
| 151 | + $sql = 'client like ?'; |
|
| 152 | + $query->whereRaw($sql, ["%{$keyword}%"]); |
|
| 153 | + }) |
|
| 154 | + |
|
| 155 | + ->filterColumn('number', function ($query, $keyword) { |
|
| 156 | + $sql = 'number like ?'; |
|
| 157 | + $query->whereRaw($sql, ["%{$keyword}%"]); |
|
| 158 | + }) |
|
| 159 | 159 | ->filterColumn('price_override', function ($query, $keyword) { |
| 160 | 160 | $sql = 'price_override like ?'; |
| 161 | 161 | $query->whereRaw($sql, ["%{$keyword}%"]); |
| 162 | 162 | }) |
| 163 | - ->filterColumn('order_status', function ($query, $keyword) { |
|
| 164 | - $sql = 'order_status like ?'; |
|
| 165 | - $query->whereRaw($sql, ["%{$keyword}%"]); |
|
| 166 | - }) |
|
| 167 | - |
|
| 168 | - ->filterColumn('ends_at', function ($query, $keyword) { |
|
| 169 | - $sql = 'ends_at like ?'; |
|
| 170 | - $query->whereRaw($sql, ["%{$keyword}%"]); |
|
| 171 | - }) |
|
| 172 | - |
|
| 173 | - ->rawColumns(['checkbox', 'date', 'client', 'number', |
|
| 174 | - 'price_override', 'order_status', 'ends_at', 'action', ]) |
|
| 163 | + ->filterColumn('order_status', function ($query, $keyword) { |
|
| 164 | + $sql = 'order_status like ?'; |
|
| 165 | + $query->whereRaw($sql, ["%{$keyword}%"]); |
|
| 166 | + }) |
|
| 167 | + |
|
| 168 | + ->filterColumn('ends_at', function ($query, $keyword) { |
|
| 169 | + $sql = 'ends_at like ?'; |
|
| 170 | + $query->whereRaw($sql, ["%{$keyword}%"]); |
|
| 171 | + }) |
|
| 172 | + |
|
| 173 | + ->rawColumns(['checkbox', 'date', 'client', 'number', |
|
| 174 | + 'price_override', 'order_status', 'ends_at', 'action', ]) |
|
| 175 | 175 | ->make(true); |
| 176 | 176 | } |
| 177 | 177 | |
@@ -102,16 +102,16 @@ discard block |
||
| 102 | 102 | |
| 103 | 103 | return \DataTables::of($query->take(100)) |
| 104 | 104 | ->setTotalRecords($query->count()) |
| 105 | - ->addColumn('checkbox', function ($model) { |
|
| 105 | + ->addColumn('checkbox', function($model) { |
|
| 106 | 106 | return "<input type='checkbox' class='order_checkbox' value=". |
| 107 | 107 | $model->id.' name=select[] id=check>'; |
| 108 | 108 | }) |
| 109 | - ->addColumn('date', function ($model) { |
|
| 109 | + ->addColumn('date', function($model) { |
|
| 110 | 110 | $date = $model->created_at; |
| 111 | 111 | |
| 112 | 112 | return "<span style='display:none'>$model->id</span>".$date; |
| 113 | 113 | }) |
| 114 | - ->addColumn('client', function ($model) { |
|
| 114 | + ->addColumn('client', function($model) { |
|
| 115 | 115 | $user = $this->user->where('id', $model->client)->first(); |
| 116 | 116 | $first = $user->first_name; |
| 117 | 117 | $last = $user->last_name; |
@@ -119,22 +119,22 @@ discard block |
||
| 119 | 119 | |
| 120 | 120 | return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'<a>'; |
| 121 | 121 | }) |
| 122 | - ->addColumn('number', function ($model) { |
|
| 122 | + ->addColumn('number', function($model) { |
|
| 123 | 123 | return ucfirst($model->number); |
| 124 | 124 | }) |
| 125 | - ->addColumn('price_override', function ($model) { |
|
| 125 | + ->addColumn('price_override', function($model) { |
|
| 126 | 126 | return ucfirst($model->price_override); |
| 127 | 127 | }) |
| 128 | - ->addColumn('order_status', function ($model) { |
|
| 128 | + ->addColumn('order_status', function($model) { |
|
| 129 | 129 | return ucfirst($model->order_status); |
| 130 | 130 | }) |
| 131 | 131 | // ->showColumns('number', 'price_override', 'order_status') |
| 132 | - ->addColumn('ends_at', function ($model) { |
|
| 132 | + ->addColumn('ends_at', function($model) { |
|
| 133 | 133 | $end = $this->getEndDate($model); |
| 134 | 134 | |
| 135 | 135 | return $end; |
| 136 | 136 | }) |
| 137 | - ->addColumn('action', function ($model) { |
|
| 137 | + ->addColumn('action', function($model) { |
|
| 138 | 138 | $sub = $model->subscription()->first(); |
| 139 | 139 | $status = $this->checkInvoiceStatusByOrderId($model->id); |
| 140 | 140 | $url = $this->getUrl($model, $status, $sub); |
@@ -142,30 +142,30 @@ discard block |
||
| 142 | 142 | return $url; |
| 143 | 143 | }) |
| 144 | 144 | |
| 145 | - ->filterColumn('created_at', function ($query, $keyword) { |
|
| 145 | + ->filterColumn('created_at', function($query, $keyword) { |
|
| 146 | 146 | $sql = 'created_at like ?'; |
| 147 | 147 | $query->whereRaw($sql, ["%{$keyword}%"]); |
| 148 | 148 | }) |
| 149 | 149 | |
| 150 | - ->filterColumn('client', function ($query, $keyword) { |
|
| 150 | + ->filterColumn('client', function($query, $keyword) { |
|
| 151 | 151 | $sql = 'client like ?'; |
| 152 | 152 | $query->whereRaw($sql, ["%{$keyword}%"]); |
| 153 | 153 | }) |
| 154 | 154 | |
| 155 | - ->filterColumn('number', function ($query, $keyword) { |
|
| 155 | + ->filterColumn('number', function($query, $keyword) { |
|
| 156 | 156 | $sql = 'number like ?'; |
| 157 | 157 | $query->whereRaw($sql, ["%{$keyword}%"]); |
| 158 | 158 | }) |
| 159 | - ->filterColumn('price_override', function ($query, $keyword) { |
|
| 159 | + ->filterColumn('price_override', function($query, $keyword) { |
|
| 160 | 160 | $sql = 'price_override like ?'; |
| 161 | 161 | $query->whereRaw($sql, ["%{$keyword}%"]); |
| 162 | 162 | }) |
| 163 | - ->filterColumn('order_status', function ($query, $keyword) { |
|
| 163 | + ->filterColumn('order_status', function($query, $keyword) { |
|
| 164 | 164 | $sql = 'order_status like ?'; |
| 165 | 165 | $query->whereRaw($sql, ["%{$keyword}%"]); |
| 166 | 166 | }) |
| 167 | 167 | |
| 168 | - ->filterColumn('ends_at', function ($query, $keyword) { |
|
| 168 | + ->filterColumn('ends_at', function($query, $keyword) { |
|
| 169 | 169 | $sql = 'ends_at like ?'; |
| 170 | 170 | $query->whereRaw($sql, ["%{$keyword}%"]); |
| 171 | 171 | }) |
@@ -52,8 +52,8 @@ discard block |
||
| 52 | 52 | protected function mapWebRoutes() |
| 53 | 53 | { |
| 54 | 54 | Route::middleware('web') |
| 55 | - ->namespace($this->namespace) |
|
| 56 | - ->group(base_path('routes/web.php')); |
|
| 55 | + ->namespace($this->namespace) |
|
| 56 | + ->group(base_path('routes/web.php')); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | /** |
@@ -66,8 +66,8 @@ discard block |
||
| 66 | 66 | protected function mapApiRoutes() |
| 67 | 67 | { |
| 68 | 68 | Route::prefix('api') |
| 69 | - ->middleware('api') |
|
| 70 | - ->namespace($this->namespace) |
|
| 71 | - ->group(base_path('routes/api.php')); |
|
| 69 | + ->middleware('api') |
|
| 70 | + ->namespace($this->namespace) |
|
| 71 | + ->group(base_path('routes/api.php')); |
|
| 72 | 72 | } |
| 73 | 73 | } |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | */ |
| 15 | 15 | protected $commands = [ |
| 16 | 16 | // |
| 17 | - 'App\Console\Commands\Inspire', |
|
| 17 | + 'App\Console\Commands\Inspire', |
|
| 18 | 18 | \App\Console\Commands\Install::class, |
| 19 | 19 | 'App\Console\Commands\ExpiryCron', |
| 20 | 20 | ]; |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | protected function schedule(Schedule $schedule) |
| 30 | 30 | { |
| 31 | 31 | $schedule->command('inspire') |
| 32 | - ->hourly(); |
|
| 32 | + ->hourly(); |
|
| 33 | 33 | |
| 34 | 34 | $schedule->command('expiry')->hourly(); |
| 35 | 35 | } |
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | return ''; |
| 75 | 75 | |
| 76 | 76 | // return "Product has been {$eventName}"; |
| 77 | - // \Auth::user()->activity; |
|
| 77 | + // \Auth::user()->activity; |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | /** |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | return ''; |
| 32 | 32 | |
| 33 | 33 | // return "Product has been {$eventName}"; |
| 34 | - // \Auth::user()->activity; |
|
| 34 | + // \Auth::user()->activity; |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | public function planPrice() |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | return ''; |
| 38 | 38 | |
| 39 | 39 | // return "Product has been {$eventName}"; |
| 40 | - // \Auth::user()->activity; |
|
| 40 | + // \Auth::user()->activity; |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | public function invoiceItem() |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | protected static $logName = 'Product'; |
| 19 | 19 | |
| 20 | 20 | protected static $logAttributes = ['name', 'description', 'type', 'file', 'category', |
| 21 | - 'github_owner', 'github_repository', 'version', 'subscription', ]; |
|
| 21 | + 'github_owner', 'github_repository', 'version', 'subscription', ]; |
|
| 22 | 22 | |
| 23 | 23 | protected static $logOnlyDirty = true; |
| 24 | 24 | |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | return ''; |
| 41 | 41 | |
| 42 | 42 | // return "Product has been {$eventName}"; |
| 43 | - // \Auth::user()->activity; |
|
| 43 | + // \Auth::user()->activity; |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | // protected static $recordEvents = ['deleted']; |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | use LogsActivity; |
| 12 | 12 | protected $table = 'products'; |
| 13 | 13 | protected $fillable = ['name', 'description', 'type', 'group', 'file', 'image', 'require_domain', 'category', |
| 14 | - 'stock_control', 'stock_qty', 'sort_order', 'tax_apply', 'retired', 'hidden', 'auto_terminate', |
|
| 14 | + 'stock_control', 'stock_qty', 'sort_order', 'tax_apply', 'retired', 'hidden', 'auto_terminate', |
|
| 15 | 15 | 'setup_order_placed', 'setup_first_payment', 'setup_accept_manually', |
| 16 | 16 | 'no_auto_setup', 'shoping_cart_link', 'process_url', 'github_owner', |
| 17 | 17 | 'github_repository', |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | protected static $logName = 'Product'; |
| 21 | 21 | |
| 22 | 22 | protected static $logAttributes = ['name', 'description', 'type', 'file', 'category', |
| 23 | - 'github_owner', 'github_repository', 'version', 'subscription', ]; |
|
| 23 | + 'github_owner', 'github_repository', 'version', 'subscription', ]; |
|
| 24 | 24 | |
| 25 | 25 | protected static $logOnlyDirty = true; |
| 26 | 26 | |