Completed
Push — master ( 63391e...78c3e4 )
by vijay
57:32
created
app/Events/SmsIntegration.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -14,6 +14,7 @@
 block discarded – undo
14 14
     /**
15 15
      * Create a new event instance.
16 16
      *
17
+     * @param \Illuminate\Http\Request $para
17 18
      * @return void
18 19
      */
19 20
     public function __construct($para)
Please login to merge, or discard this patch.
app/Http/Controllers/Product/ServiceController.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
     /**
63 63
      * Store a newly created resource in storage.
64 64
      *
65
-     * @return Response
65
+     * @return \Illuminate\Http\RedirectResponse
66 66
      */
67 67
     public function store(Request $request) {
68 68
         $this->service->fill($request->input())->save();
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
      * Update the specified resource in storage.
97 97
      *
98 98
      * @param  int  $id
99
-     * @return Response
99
+     * @return \Illuminate\Http\RedirectResponse
100 100
      */
101 101
     public function update($id, Request $request) {
102 102
         $service = $this->service->where('id',$id)->first();
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -35,14 +35,14 @@
 block discarded – undo
35 35
     public function GetServices()
36 36
     {
37 37
         return \Datatable::collection($this->service->get())
38
-                        ->addColumn('#', function ($model) {
38
+                        ->addColumn('#', function($model) {
39 39
                             return "<input type='checkbox' value=".$model->id.' name=select[] id=check>';
40 40
                         })
41 41
                         ->showColumns('name')
42
-                        ->addColumn('plan', function ($model) {
42
+                        ->addColumn('plan', function($model) {
43 43
                             //return $this->product->plan()->name;
44 44
                         })
45
-                        ->addColumn('action', function ($model) {
45
+                        ->addColumn('action', function($model) {
46 46
                             return '<a href='.url('products/'.$model->id.'/edit')." class='btn btn-sm btn-primary'>Edit</a>";
47 47
                         })
48 48
                         ->searchColumns('name')
Please login to merge, or discard this patch.
app/Plugins/Ccavanue/Controllers/ProcessController.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -78,6 +78,9 @@
 block discarded – undo
78 78
         }
79 79
     }
80 80
 
81
+    /**
82
+     * @param string $data
83
+     */
81 84
     public function SubmitData($data, $url, $access_code, $working_key) {
82 85
         try {
83 86
             $crypto = new Crypto;
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -105,10 +105,10 @@
 block discarded – undo
105 105
         try {
106 106
             $crypto = new Crypto();
107 107
             $ccavanue = $this->ccavanue->findOrFail(1);
108
-            $workingKey = $ccavanue->working_key;  //Working Key should be provided here.
109
-            $encResponse = $request->get('encResp');   //This is the response sent by the CCAvenue Server
108
+            $workingKey = $ccavanue->working_key; //Working Key should be provided here.
109
+            $encResponse = $request->get('encResp'); //This is the response sent by the CCAvenue Server
110 110
 
111
-            $rcvdString = $crypto->decrypt($encResponse, $workingKey);  //Crypto Decryption used as per the specified working key.
111
+            $rcvdString = $crypto->decrypt($encResponse, $workingKey); //Crypto Decryption used as per the specified working key.
112 112
             $order_status = '';
113 113
             $decryptValues = explode('&', $rcvdString);
114 114
             $dataSize = count($decryptValues);
Please login to merge, or discard this patch.
app/Http/Controllers/ServiceProvider/ServiceProviderController.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -128,8 +128,8 @@
 block discarded – undo
128 128
             
129 129
             
130 130
             //dd($request);
131
-           \Event::fire(new \App\Events\SmsIntegration($request));
132
-           //\Event::fire(new \App\Events\PaymentGateway(['request' => $request, 'cart' => [], 'order' => $order]));
131
+            \Event::fire(new \App\Events\SmsIntegration($request));
132
+            //\Event::fire(new \App\Events\PaymentGateway(['request' => $request, 'cart' => [], 'order' => $order]));
133 133
             
134 134
         } catch (\Exception $ex) {
135 135
             return redirect()->back()->with('fails',$ex->getMessage());
Please login to merge, or discard this 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/User.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
         CanResetPassword;
18 18
 
19 19
 // use Billable;
20
-   // use CustomerBillableTrait;
20
+    // use CustomerBillableTrait;
21 21
 
22 22
     /**
23 23
      * The database table used by the model.
Please login to merge, or discard this patch.
database/migrations/2016_01_29_050215_create_templates_table.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
      */
13 13
     public function up()
14 14
     {
15
-        Schema::create('templates', function (Blueprint $table) {
15
+        Schema::create('templates', function(Blueprint $table) {
16 16
             $table->increments('id');
17 17
             $table->string('name');
18 18
             $table->integer('type')->unsigned();
Please login to merge, or discard this patch.
database/migrations/2016_01_29_075817_create_jobs_table.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
      */
13 13
     public function up()
14 14
     {
15
-        Schema::create('jobs', function (Blueprint $table) {
15
+        Schema::create('jobs', function(Blueprint $table) {
16 16
             $table->bigIncrements('id');
17 17
             $table->string('queue');
18 18
             $table->longText('payload');
Please login to merge, or discard this patch.
database/migrations/2016_02_15_094703_create_frontend_pages_table.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
      */
13 13
     public function up()
14 14
     {
15
-        Schema::create('frontend_pages', function (Blueprint $table) {
15
+        Schema::create('frontend_pages', function(Blueprint $table) {
16 16
             $table->increments('id');
17 17
             $table->integer('parent_page_id');
18 18
             $table->string('slug');
Please login to merge, or discard this patch.
database/migrations/2016_01_29_050144_create_template_types_table.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
      */
13 13
     public function up()
14 14
     {
15
-        Schema::create('template_types', function (Blueprint $table) {
15
+        Schema::create('template_types', function(Blueprint $table) {
16 16
             $table->increments('id');
17 17
             $table->string('name');
18 18
             $table->timestamps();
Please login to merge, or discard this patch.