@@ -19,7 +19,7 @@  | 
                                                    ||
| 19 | 19 |      { | 
                                                        
| 20 | 20 |          try { | 
                                                        
| 21 | 21 |              if (!Schema::hasTable('ccavanue')) { | 
                                                        
| 22 | -                Schema::create('ccavanue', function ($table) { | 
                                                        |
| 22 | +                Schema::create('ccavanue', function($table) { | 
                                                        |
| 23 | 23 |                      $table->increments('id'); | 
                                                        
| 24 | 24 |                      $table->string('merchant_id'); | 
                                                        
| 25 | 25 |                      $table->string('access_code'); | 
                                                        
@@ -19,7 +19,7 @@  | 
                                                    ||
| 19 | 19 |      { | 
                                                        
| 20 | 20 |          try { | 
                                                        
| 21 | 21 |              if (!Schema::hasTable('paypal')) { | 
                                                        
| 22 | -                Schema::create('paypal', function ($table) { | 
                                                        |
| 22 | +                Schema::create('paypal', function($table) { | 
                                                        |
| 23 | 23 |                      $table->increments('id'); | 
                                                        
| 24 | 24 |                      $table->string('business'); | 
                                                        
| 25 | 25 |                      $table->string('cmd'); | 
                                                        
@@ -3,7 +3,7 @@  | 
                                                    ||
| 3 | 3 |  Route::get('payment-gateway/ccavanue', 'App\Plugins\Ccavanue\Controllers\SettingsController@Settings'); | 
                                                        
| 4 | 4 |  Route::patch('payment-gateway/ccavanue', 'App\Plugins\Ccavanue\Controllers\SettingsController@postSettings'); | 
                                                        
| 5 | 5 | Route::match(['get', 'post'], 'payment-gateway/response', 'App\Plugins\Ccavanue\Controllers\ProcessController@response');  | 
                                                        
| 6 | -\Event::listen('App\Events\PaymentGateway', function ($event) { | 
                                                        |
| 6 | +\Event::listen('App\Events\PaymentGateway', function($event) { | 
                                                        |
| 7 | 7 | $controller = new App\Plugins\Ccavanue\Controllers\ProcessController();  | 
                                                        
| 8 | 8 | echo $controller->PassToPayment($event->para);  | 
                                                        
| 9 | 9 | });  | 
                                                        
@@ -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 | |
@@ -150,36 +150,36 @@  | 
                                                    ||
| 150 | 150 | return $url;  | 
                                                        
| 151 | 151 | })  | 
                                                        
| 152 | 152 | |
| 153 | -                         ->filterColumn('created_at', function ($query, $keyword) { | 
                                                        |
| 154 | - $sql = 'created_at like ?';  | 
                                                        |
| 155 | -                             $query->whereRaw($sql, ["%{$keyword}%"]); | 
                                                        |
| 156 | - })  | 
                                                        |
| 157 | -  | 
                                                        |
| 158 | -                          ->filterColumn('client', function ($query, $keyword) { | 
                                                        |
| 159 | - $sql = 'client like ?';  | 
                                                        |
| 160 | -                              $query->whereRaw($sql, ["%{$keyword}%"]); | 
                                                        |
| 161 | - })  | 
                                                        |
| 162 | -  | 
                                                        |
| 163 | -                           ->filterColumn('number', function ($query, $keyword) { | 
                                                        |
| 164 | - $sql = 'number like ?';  | 
                                                        |
| 165 | -                               $query->whereRaw($sql, ["%{$keyword}%"]); | 
                                                        |
| 166 | - })  | 
                                                        |
| 153 | +                            ->filterColumn('created_at', function ($query, $keyword) { | 
                                                        |
| 154 | + $sql = 'created_at like ?';  | 
                                                        |
| 155 | +                                $query->whereRaw($sql, ["%{$keyword}%"]); | 
                                                        |
| 156 | + })  | 
                                                        |
| 157 | +  | 
                                                        |
| 158 | +                            ->filterColumn('client', function ($query, $keyword) { | 
                                                        |
| 159 | + $sql = 'client like ?';  | 
                                                        |
| 160 | +                                $query->whereRaw($sql, ["%{$keyword}%"]); | 
                                                        |
| 161 | + })  | 
                                                        |
| 162 | +  | 
                                                        |
| 163 | +                            ->filterColumn('number', function ($query, $keyword) { | 
                                                        |
| 164 | + $sql = 'number like ?';  | 
                                                        |
| 165 | +                                $query->whereRaw($sql, ["%{$keyword}%"]); | 
                                                        |
| 166 | + })  | 
                                                        |
| 167 | 167 |                              ->filterColumn('price_override', function ($query, $keyword) { | 
                                                        
| 168 | 168 | $sql = 'price_override like ?';  | 
                                                        
| 169 | 169 |                                  $query->whereRaw($sql, ["%{$keyword}%"]); | 
                                                        
| 170 | 170 | })  | 
                                                        
| 171 | -                             ->filterColumn('order_status', function ($query, $keyword) { | 
                                                        |
| 172 | - $sql = 'order_status like ?';  | 
                                                        |
| 173 | -                                 $query->whereRaw($sql, ["%{$keyword}%"]); | 
                                                        |
| 174 | - })  | 
                                                        |
| 175 | -  | 
                                                        |
| 176 | -                              ->filterColumn('ends_at', function ($query, $keyword) { | 
                                                        |
| 177 | - $sql = 'ends_at like ?';  | 
                                                        |
| 178 | -                                  $query->whereRaw($sql, ["%{$keyword}%"]); | 
                                                        |
| 179 | - })  | 
                                                        |
| 180 | -  | 
                                                        |
| 181 | - ->rawColumns(['checkbox', 'date', 'client', 'number',  | 
                                                        |
| 182 | - 'price_override', 'order_status', 'productname', 'ends_at', 'action', ])  | 
                                                        |
| 171 | +                                ->filterColumn('order_status', function ($query, $keyword) { | 
                                                        |
| 172 | + $sql = 'order_status like ?';  | 
                                                        |
| 173 | +                                    $query->whereRaw($sql, ["%{$keyword}%"]); | 
                                                        |
| 174 | + })  | 
                                                        |
| 175 | +  | 
                                                        |
| 176 | +                                ->filterColumn('ends_at', function ($query, $keyword) { | 
                                                        |
| 177 | + $sql = 'ends_at like ?';  | 
                                                        |
| 178 | +                                    $query->whereRaw($sql, ["%{$keyword}%"]); | 
                                                        |
| 179 | + })  | 
                                                        |
| 180 | +  | 
                                                        |
| 181 | + ->rawColumns(['checkbox', 'date', 'client', 'number',  | 
                                                        |
| 182 | + 'price_override', 'order_status', 'productname', 'ends_at', 'action', ])  | 
                                                        |
| 183 | 183 | ->make(true);  | 
                                                        
| 184 | 184 | }  | 
                                                        
| 185 | 185 | |
@@ -104,16 +104,16 @@ discard block  | 
                                                    ||
| 104 | 104 | |
| 105 | 105 | return \DataTables::of($query->take(50))  | 
                                                        
| 106 | 106 | ->setTotalRecords($query->count())  | 
                                                        
| 107 | -                        ->addColumn('checkbox', function ($model) { | 
                                                        |
| 107 | +                        ->addColumn('checkbox', function($model) { | 
                                                        |
| 108 | 108 | return "<input type='checkbox' class='order_checkbox' value=".  | 
                                                        
| 109 | 109 | $model->id.' name=select[] id=check>';  | 
                                                        
| 110 | 110 | })  | 
                                                        
| 111 | -                        ->addColumn('date', function ($model) { | 
                                                        |
| 111 | +                        ->addColumn('date', function($model) { | 
                                                        |
| 112 | 112 | $date = $model->created_at;  | 
                                                        
| 113 | 113 | |
| 114 | 114 | return "<span style='display:none'>$model->id</span>".$date;  | 
                                                        
| 115 | 115 | })  | 
                                                        
| 116 | -                        ->addColumn('client', function ($model) { | 
                                                        |
| 116 | +                        ->addColumn('client', function($model) { | 
                                                        |
| 117 | 117 |                              $user = $this->user->where('id', $model->client)->first(); | 
                                                        
| 118 | 118 | $first = $user->first_name;  | 
                                                        
| 119 | 119 | $last = $user->last_name;  | 
                                                        
@@ -121,28 +121,28 @@ discard block  | 
                                                    ||
| 121 | 121 | |
| 122 | 122 |                              return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'<a>'; | 
                                                        
| 123 | 123 | })  | 
                                                        
| 124 | -                        ->addColumn('productname', function ($model) { | 
                                                        |
| 124 | +                        ->addColumn('productname', function($model) { | 
                                                        |
| 125 | 125 | $productid = ($model->product);  | 
                                                        
| 126 | 126 |                              $productName = Product::where('id', $productid)->pluck('name')->first(); | 
                                                        
| 127 | 127 | |
| 128 | 128 | return $productName;  | 
                                                        
| 129 | 129 | })  | 
                                                        
| 130 | -                        ->addColumn('number', function ($model) { | 
                                                        |
| 130 | +                        ->addColumn('number', function($model) { | 
                                                        |
| 131 | 131 | return ucfirst($model->number);  | 
                                                        
| 132 | 132 | })  | 
                                                        
| 133 | -                        ->addColumn('price_override', function ($model) { | 
                                                        |
| 133 | +                        ->addColumn('price_override', function($model) { | 
                                                        |
| 134 | 134 | return ucfirst($model->price_override);  | 
                                                        
| 135 | 135 | })  | 
                                                        
| 136 | -                        ->addColumn('order_status', function ($model) { | 
                                                        |
| 136 | +                        ->addColumn('order_status', function($model) { | 
                                                        |
| 137 | 137 | return ucfirst($model->order_status);  | 
                                                        
| 138 | 138 | })  | 
                                                        
| 139 | 139 |                          // ->showColumns('number', 'price_override', 'order_status') | 
                                                        
| 140 | -                        ->addColumn('ends_at', function ($model) { | 
                                                        |
| 140 | +                        ->addColumn('ends_at', function($model) { | 
                                                        |
| 141 | 141 | $end = $this->getEndDate($model);  | 
                                                        
| 142 | 142 | |
| 143 | 143 | return $end;  | 
                                                        
| 144 | 144 | })  | 
                                                        
| 145 | -                        ->addColumn('action', function ($model) { | 
                                                        |
| 145 | +                        ->addColumn('action', function($model) { | 
                                                        |
| 146 | 146 | $sub = $model->subscription()->first();  | 
                                                        
| 147 | 147 | $status = $this->checkInvoiceStatusByOrderId($model->id);  | 
                                                        
| 148 | 148 | $url = $this->getUrl($model, $status, $sub);  | 
                                                        
@@ -150,30 +150,30 @@ discard block  | 
                                                    ||
| 150 | 150 | return $url;  | 
                                                        
| 151 | 151 | })  | 
                                                        
| 152 | 152 | |
| 153 | -                         ->filterColumn('created_at', function ($query, $keyword) { | 
                                                        |
| 153 | +                         ->filterColumn('created_at', function($query, $keyword) { | 
                                                        |
| 154 | 154 | $sql = 'created_at like ?';  | 
                                                        
| 155 | 155 |                               $query->whereRaw($sql, ["%{$keyword}%"]); | 
                                                        
| 156 | 156 | })  | 
                                                        
| 157 | 157 | |
| 158 | -                          ->filterColumn('client', function ($query, $keyword) { | 
                                                        |
| 158 | +                          ->filterColumn('client', function($query, $keyword) { | 
                                                        |
| 159 | 159 | $sql = 'client like ?';  | 
                                                        
| 160 | 160 |                                $query->whereRaw($sql, ["%{$keyword}%"]); | 
                                                        
| 161 | 161 | })  | 
                                                        
| 162 | 162 | |
| 163 | -                           ->filterColumn('number', function ($query, $keyword) { | 
                                                        |
| 163 | +                           ->filterColumn('number', function($query, $keyword) { | 
                                                        |
| 164 | 164 | $sql = 'number like ?';  | 
                                                        
| 165 | 165 |                                 $query->whereRaw($sql, ["%{$keyword}%"]); | 
                                                        
| 166 | 166 | })  | 
                                                        
| 167 | -                            ->filterColumn('price_override', function ($query, $keyword) { | 
                                                        |
| 167 | +                            ->filterColumn('price_override', function($query, $keyword) { | 
                                                        |
| 168 | 168 | $sql = 'price_override like ?';  | 
                                                        
| 169 | 169 |                                  $query->whereRaw($sql, ["%{$keyword}%"]); | 
                                                        
| 170 | 170 | })  | 
                                                        
| 171 | -                             ->filterColumn('order_status', function ($query, $keyword) { | 
                                                        |
| 171 | +                             ->filterColumn('order_status', function($query, $keyword) { | 
                                                        |
| 172 | 172 | $sql = 'order_status like ?';  | 
                                                        
| 173 | 173 |                                   $query->whereRaw($sql, ["%{$keyword}%"]); | 
                                                        
| 174 | 174 | })  | 
                                                        
| 175 | 175 | |
| 176 | -                              ->filterColumn('ends_at', function ($query, $keyword) { | 
                                                        |
| 176 | +                              ->filterColumn('ends_at', function($query, $keyword) { | 
                                                        |
| 177 | 177 | $sql = 'ends_at like ?';  | 
                                                        
| 178 | 178 |                                    $query->whereRaw($sql, ["%{$keyword}%"]); | 
                                                        
| 179 | 179 | })  | 
                                                        
@@ -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 | }  | 
                                                        
@@ -48,7 +48,7 @@  | 
                                                    ||
| 48 | 48 | <div class="pull-right">  | 
                                                        
| 49 | 49 | |
| 50 | 50 | <?php  | 
                                                        
| 51 | - $status=0;  | 
                                                        |
| 51 | + $status = 0;  | 
                                                        |
| 52 | 52 | |
| 53 | 53 | ?>  | 
                                                        
| 54 | 54 |                              <div class="btn-group {{$status == '0' ? 'locked_active unlocked_inactive' : 'locked_inactive unlocked_active'}}" id="toggle_event" style="margin-top:-8px"> | 
                                                        
@@ -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()  |