Completed
Branch development (b1b115)
by Johannes
10:28
created
app/Plugins/Ccavanue/Controllers/SettingsController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
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');
Please login to merge, or discard this patch.
app/Http/Controllers/Licence/ServiceController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
     {
33 33
         return \Datatable::collection($this->service->get())
34 34
                         ->showColumns('name')
35
-                        ->addColumn('action', function ($model) {
35
+                        ->addColumn('action', function($model) {
36 36
                             return '<a href='.url('services/'.$model->id.'/edit')." class='btn btn-sm btn-primary'>Edit</a>";
37 37
                         })
38 38
                         ->searchColumns('name')
Please login to merge, or discard this patch.
app/Http/Controllers/Licence/LicenceController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
     {
38 38
         return \Datatable::collection($this->licence->get())
39 39
                         ->showColumns('name', 'description', 'number_of_sla', 'price')
40
-                        ->addColumn('action', function ($model) {
40
+                        ->addColumn('action', function($model) {
41 41
                             return '<a href='.url('licences/'.$model->id.'/edit')." class='btn btn-sm btn-primary'>Edit</a>";
42 42
                         })
43 43
                         ->searchColumns('description')
Please login to merge, or discard this patch.
app/Http/Controllers/ServiceProvider/ServiceProviderController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -88,25 +88,25 @@
 block discarded – undo
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')
Please login to merge, or discard this patch.
app/Plugins/Paypal/Controllers/SettingsController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
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');
Please login to merge, or discard this patch.
app/Http/Controllers/Order/SubscriptionController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
         //dd($this->invoice->get());
48 48
         return \Datatable::collection($this->subscription->get())
49 49
 
50
-                        ->addColumn('user_id', function ($model) {
50
+                        ->addColumn('user_id', function($model) {
51 51
                             $user = $model->user()->first();
52 52
                             $first = $user->first_name;
53 53
                             $last = $user->last_name;
@@ -55,18 +55,18 @@  discard block
 block discarded – undo
55 55
 
56 56
                             return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'</a>';
57 57
                         })
58
-                        ->addColumn('plan_id', function ($model) {
58
+                        ->addColumn('plan_id', function($model) {
59 59
                             $name = $this->plan->where('id', $model->plan_id)->first()->name;
60 60
 
61 61
                             return $name;
62 62
                         })
63
-                        ->addColumn('order_id', function ($model) {
63
+                        ->addColumn('order_id', function($model) {
64 64
                             $name = $this->order->where('id', $model->order_id)->first()->id;
65 65
 
66 66
                             return $name;
67 67
                         })
68 68
                         ->showColumns('ends_at')
69
-                        ->addColumn('action', function ($model) {
69
+                        ->addColumn('action', function($model) {
70 70
                             return '<a href='.url('subscriptions/'.$model->id)." class='btn btn-sm btn-primary'>View</a>";
71 71
                         })
72 72
                         ->searchColumns('ends_at')
Please login to merge, or discard this patch.
app/Plugins/Paypal/routes.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-\Event::listen('App\Events\PaymentGateway', function ($event) {
3
+\Event::listen('App\Events\PaymentGateway', function($event) {
4 4
     $controller = new App\Plugins\Paypal\Controllers\ProcessController();
5 5
     echo $controller->PassToPayment($event->para);
6 6
 });
Please login to merge, or discard this patch.
app/Plugins/Ccavanue/routes.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
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
 });
Please login to merge, or discard this patch.
app/Plugins/Ccavanue/Controllers/ProcessController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -126,10 +126,10 @@
 block discarded – undo
126 126
             $url = '';
127 127
             $crypto = new Crypto();
128 128
             $ccavanue = $this->ccavanue->findOrFail(1);
129
-            $workingKey = $ccavanue->working_key;  //Working Key should be provided here.
130
-            $encResponse = $request->get('encResp');   //This is the response sent by the CCAvenue Server
129
+            $workingKey = $ccavanue->working_key; //Working Key should be provided here.
130
+            $encResponse = $request->get('encResp'); //This is the response sent by the CCAvenue Server
131 131
 
132
-            $rcvdString = $crypto->decrypt($encResponse, $workingKey);  //Crypto Decryption used as per the specified working key.
132
+            $rcvdString = $crypto->decrypt($encResponse, $workingKey); //Crypto Decryption used as per the specified working key.
133 133
             $order_status = '';
134 134
             $decryptValues = explode('&', $rcvdString);
135 135
             $dataSize = count($decryptValues);
Please login to merge, or discard this patch.