Completed
Branch master (bb48cc)
by vijay
148:50 queued 92:39
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   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -35,15 +35,15 @@  discard block
 block discarded – undo
35 35
     public function GetServices()
36 36
     {
37 37
         return \Datatable::collection($this->service->get())
38
-                        ->addColumn('#', function ($model) {
39
-                            return "<input type='checkbox' value=".$model->id.' name=select[] id=check>';
38
+                        ->addColumn('#', function($model) {
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) {
46
-                            return '<a href='.url('products/'.$model->id.'/edit')." class='btn btn-sm btn-primary'>Edit</a>";
45
+                        ->addColumn('action', function($model) {
46
+                            return '<a href=' . url('products/' . $model->id . '/edit') . " class='btn btn-sm btn-primary'>Edit</a>";
47 47
                         })
48 48
                         ->searchColumns('name')
49 49
                         ->orderColumns('name')
@@ -135,25 +135,25 @@  discard block
 block discarded – undo
135 135
                 } else {
136 136
                     echo "<div class='alert alert-danger alert-dismissable'>
137 137
                     <i class='fa fa-ban'></i>
138
-                    <b>".\Lang::get('message.alert').'!</b> '.\Lang::get('message.failed').'
138
+                    <b>".\Lang::get('message.alert') . '!</b> ' . \Lang::get('message.failed') . '
139 139
                     <button type=button class=close data-dismiss=alert aria-hidden=true>&times;</button>
140
-                        '.\Lang::get('message.no-record').'
140
+                        '.\Lang::get('message.no-record') . '
141 141
                 </div>';
142 142
                     //echo \Lang::get('message.no-record') . '  [id=>' . $id . ']';
143 143
                 }
144 144
             }
145 145
             echo "<div class='alert alert-success alert-dismissable'>
146 146
                     <i class='fa fa-ban'></i>
147
-                    <b>".\Lang::get('message.alert').'!</b> '.\Lang::get('message.success').'
147
+                    <b>".\Lang::get('message.alert') . '!</b> ' . \Lang::get('message.success') . '
148 148
                     <button type=button class=close data-dismiss=alert aria-hidden=true>&times;</button>
149
-                        '.\Lang::get('message.deleted-successfully').'
149
+                        '.\Lang::get('message.deleted-successfully') . '
150 150
                 </div>';
151 151
         } else {
152 152
             echo "<div class='alert alert-danger alert-dismissable'>
153 153
                     <i class='fa fa-ban'></i>
154
-                    <b>".\Lang::get('message.alert').'!</b> '.\Lang::get('message.failed').'
154
+                    <b>".\Lang::get('message.alert') . '!</b> ' . \Lang::get('message.failed') . '
155 155
                     <button type=button class=close data-dismiss=alert aria-hidden=true>&times;</button>
156
-                        '.\Lang::get('message.select-a-row').'
156
+                        '.\Lang::get('message.select-a-row') . '
157 157
                 </div>';
158 158
             //echo \Lang::get('message.select-a-row');
159 159
         }
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   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
                 $merchant_id = $ccavanue->merchant_id;
37 37
                 $redirect_url = $ccavanue->redirect_url;
38 38
                 $cancel_url = $ccavanue->cancel_url;
39
-                $name = $request->input('first_name').' '.$request->input('last_name');
39
+                $name = $request->input('first_name') . ' ' . $request->input('last_name');
40 40
                 $address = $request->input('address');
41 41
                 $city = $request->input('address');
42 42
                 $state = $request->input('state');
@@ -50,21 +50,21 @@  discard block
 block discarded – undo
50 50
                 $working_key = $ccavanue->working_key;
51 51
                 $access_code = $ccavanue->access_code;
52 52
 
53
-                $merchant_data = 'order_id'.'='.$orderid.
54
-                        '&amount'.'='.$total.
55
-                        '&merchant_id'.'='.$merchant_id.
56
-                        '&redirect_url'.'='.$redirect_url.
57
-                        '&cancel_url'.'='.$cancel_url.
58
-                        '&language'.'='.'EN'.
59
-                        '&billing_name'.'='.$name.
60
-                        '&billing_address'.'='.$address.
61
-                        '&billing_city'.'='.$city.
62
-                        '&billing_state'.'='.$state.
63
-                        '&billing_zip'.'='.$zip.
64
-                        '&billing_email'.'='.$email.
65
-                        '&billing_tel'.'='.$mobile.
66
-                        '&billing_country'.'='.$country.
67
-                        '&currency'.'='.$currency.'&';
53
+                $merchant_data = 'order_id' . '=' . $orderid .
54
+                        '&amount' . '=' . $total .
55
+                        '&merchant_id' . '=' . $merchant_id .
56
+                        '&redirect_url' . '=' . $redirect_url .
57
+                        '&cancel_url' . '=' . $cancel_url .
58
+                        '&language' . '=' . 'EN' .
59
+                        '&billing_name' . '=' . $name .
60
+                        '&billing_address' . '=' . $address .
61
+                        '&billing_city' . '=' . $city .
62
+                        '&billing_state' . '=' . $state .
63
+                        '&billing_zip' . '=' . $zip .
64
+                        '&billing_email' . '=' . $email .
65
+                        '&billing_tel' . '=' . $mobile .
66
+                        '&billing_country' . '=' . $country .
67
+                        '&currency' . '=' . $currency . '&';
68 68
                 $merchant_data = str_replace(' ', '%20', $merchant_data);
69 69
                 $this->SubmitData($merchant_data, $ccavanue_url, $access_code, $working_key);
70 70
             }
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   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -88,26 +88,26 @@
 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) {
110
-                            return '<a href='.url('slas/'.$model->id.'/edit')." class='btn btn-sm btn-primary'>Edit</a>";
109
+                        ->addColumn('action', function($model) {
110
+                            return '<a href=' . url('slas/' . $model->id . '/edit') . " class='btn btn-sm btn-primary'>Edit</a>";
111 111
                         })
112 112
                         ->searchColumns('name')
113 113
                         ->orderColumns('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.
resources/views/themes/default1/user/client/show.blade.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -151,9 +151,9 @@  discard block
 block discarded – undo
151 151
                                                 <?php
152 152
                                                 $template_controller = new \App\Http\Controllers\Common\TemplateController();
153 153
                                                 $user = $client;
154
-                                                $invoiceItems= \App\Model\Order\InvoiceItem::where('invoice_id',$invoice->id)->get();
155
-                                                $body = view('themes.default1.invoice.show',compact('invoice','user','invoiceItems'))->render();
156
-                                                $model_popup = $template_controller->popup('Invoice',$body , 'execute order', 'invoice' . $invoice->id);
154
+                                                $invoiceItems = \App\Model\Order\InvoiceItem::where('invoice_id', $invoice->id)->get();
155
+                                                $body = view('themes.default1.invoice.show', compact('invoice', 'user', 'invoiceItems'))->render();
156
+                                                $model_popup = $template_controller->popup('Invoice', $body, 'execute order', 'invoice' . $invoice->id);
157 157
                                                 ?>
158 158
                                                 <ul class="dropdown-menu" role="menu">
159 159
                                                     <li><a href=# class=null  data-toggle='modal' data-target="#editinvoice{{$invoice->id}}">execute order</a></li>
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
                             </thead>
196 196
                             <tbody>
197 197
                                 @forelse($orders as $order)
198
-                                <?php $payment = \App\Model\Order\Payment::where('invoice_id',$order->invoice_id)->first();  ?>
198
+                                <?php $payment = \App\Model\Order\Payment::where('invoice_id', $order->invoice_id)->first(); ?>
199 199
                                 <tr>
200 200
                                     <td>{{$order->created_at}}</td>
201 201
                                     <td>
Please login to merge, or discard this patch.
resources/views/themes/default1/invoice/show.blade.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
 
44 44
             <div class="col-md-12">
45 45
 
46
-                <?php $set = App\Model\Common\Setting::where('id', '1')->first();?>
46
+                <?php $set = App\Model\Common\Setting::where('id', '1')->first(); ?>
47 47
                 <!-- Main content -->
48 48
                 <section class="invoice">
49 49
                     <!-- title row -->
Please login to merge, or discard this patch.
public/index.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 |
19 19
 */
20 20
 
21
-require __DIR__.'/../bootstrap/autoload.php';
21
+require __DIR__ . '/../bootstrap/autoload.php';
22 22
 
23 23
 /*
24 24
 |--------------------------------------------------------------------------
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 |
33 33
 */
34 34
 
35
-$app = require_once __DIR__.'/../bootstrap/app.php';
35
+$app = require_once __DIR__ . '/../bootstrap/app.php';
36 36
 
37 37
 /*
38 38
 |--------------------------------------------------------------------------
Please login to merge, or discard this patch.
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Laravel - A PHP Framework For Web Artisans.
4
- *
5
- * @author   Taylor Otwell <[email protected]>
6
- */
3
+     * Laravel - A PHP Framework For Web Artisans.
4
+     *
5
+     * @author   Taylor Otwell <[email protected]>
6
+     */
7 7
 
8 8
 /*
9 9
 |--------------------------------------------------------------------------
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.