Completed
Push — development ( 2c680e...4ffe14 )
by Ashutosh
09:40
created
app/Http/Controllers/User/AdminOrderInvoiceController.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -14,11 +14,11 @@  discard block
 block discarded – undo
14 14
         $invoices = $invoice->where('user_id', $id)->orderBy('created_at', 'desc')->get();
15 15
 
16 16
         return\ DataTables::of($invoices)
17
-                        ->addColumn('checkbox', function ($model) {
17
+                        ->addColumn('checkbox', function($model) {
18 18
                             return "<input type='checkbox' class='invoice_checkbox' 
19 19
                             value=".$model->id.' name=select[] id=check>';
20 20
                         })
21
-                        ->addColumn('date', function ($model) use ($client) {
21
+                        ->addColumn('date', function($model) use ($client) {
22 22
                             $date1 = new \DateTime($model->date);
23 23
                             // $tz = \Auth::user()->timezone()->first()->name;
24 24
                             // $date1->setTimezone(new \DateTimeZone($tz));
@@ -26,13 +26,13 @@  discard block
 block discarded – undo
26 26
 
27 27
                             return $date;
28 28
                         })
29
-                        ->addColumn('invoice_no', function ($model) {
29
+                        ->addColumn('invoice_no', function($model) {
30 30
                             return      '<a href='.url('invoices/show?invoiceid='.$model->id).'>'.$model->number.'</a>';
31 31
                         })
32
-                        ->addColumn('total', function ($model) use ($client) {
32
+                        ->addColumn('total', function($model) use ($client) {
33 33
                             return currency_format($model->grand_total, $code = $client->currency);
34 34
                         })
35
-                         ->addColumn('paid', function ($model) use ($client) {
35
+                         ->addColumn('paid', function($model) use ($client) {
36 36
                              $payment = \App\Model\Order\Payment::where('invoice_id', $model->id)->select('amount')->get();
37 37
                              $c = count($payment);
38 38
                              $sum = 0;
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 
44 44
                              return currency_format($sum, $code = $client->currency);
45 45
                          })
46
-                         ->addColumn('balance', function ($model) use ($client) {
46
+                         ->addColumn('balance', function($model) use ($client) {
47 47
                              $payment = \App\Model\Order\Payment::where('invoice_id', $model->id)->select('amount')->get();
48 48
                              $c = count($payment);
49 49
                              $sum = 0;
@@ -55,10 +55,10 @@  discard block
 block discarded – undo
55 55
 
56 56
                              return currency_format($pendingAmount, $code = $client->currency);
57 57
                          })
58
-                          ->addColumn('status', function ($model) {
58
+                          ->addColumn('status', function($model) {
59 59
                               return $model->status;
60 60
                           })
61
-                        ->addColumn('action', function ($model) {
61
+                        ->addColumn('action', function($model) {
62 62
                             $action = '';
63 63
                             $cont = new \App\Http\Controllers\Order\TaxRatesAndCodeExpiryController();
64 64
                             $check = $cont->checkExecution($model->id);
@@ -88,35 +88,35 @@  discard block
 block discarded – undo
88 88
         $order = $client->order()->orderBy('created_at', 'desc')->get();
89 89
 
90 90
         return\ DataTables::of($order)
91
-                        ->addColumn('checkbox', function ($model) {
91
+                        ->addColumn('checkbox', function($model) {
92 92
                             return "<input type='checkbox' class='order_checkbox' 
93 93
                             value=".$model->id.' name=select[] id=checkorder>';
94 94
                         })
95
-                        ->addColumn('date', function ($model) {
95
+                        ->addColumn('date', function($model) {
96 96
                             return ucfirst($model->created_at);
97 97
                         })
98
-                        ->addColumn('product', function ($model) {
98
+                        ->addColumn('product', function($model) {
99 99
                             $productName = $model->product()->first() && $model->product()->first()->name ?
100 100
                             $model->product()->first()->name : 'Unknown';
101 101
 
102 102
                             return $productName;
103 103
                         })
104
-                        ->addColumn('number', function ($model) {
104
+                        ->addColumn('number', function($model) {
105 105
                             $number = $model->number;
106 106
 
107 107
                             return $number;
108 108
                         })
109
-                         ->addColumn('total', function ($model) use ($client) {
109
+                         ->addColumn('total', function($model) use ($client) {
110 110
                              $price = currency_format($model->price_override, $code = $client->currency);
111 111
 
112 112
                              return $price;
113 113
                          })
114
-                         ->addColumn('status', function ($model) {
114
+                         ->addColumn('status', function($model) {
115 115
                              $status = $model->order_status;
116 116
 
117 117
                              return $status;
118 118
                          })
119
-                        ->addColumn('action', function ($model) {
119
+                        ->addColumn('action', function($model) {
120 120
                             return '<a href='.url('orders/'.$model->id)." 
121 121
                             class='btn btn-sm btn-primary btn-xs'><i class='fa fa-eye' 
122 122
                             style='color:white;'> </i>&nbsp;&nbsp;View</a>";
@@ -133,25 +133,25 @@  discard block
 block discarded – undo
133 133
         $extraAmt = $this->getExtraAmtPaid($id);
134 134
 
135 135
         return\ DataTables::of($payments)
136
-                        ->addColumn('checkbox', function ($model) {
136
+                        ->addColumn('checkbox', function($model) {
137 137
                             return "<input type='checkbox' class='payment_checkbox' 
138 138
                             value=".$model->id.' name=select[] id=checkpayment>';
139 139
                         })
140
-                        ->addColumn('invoice_no', function ($model) {
140
+                        ->addColumn('invoice_no', function($model) {
141 141
                             return $model->invoice()->first() ? $model->invoice()->first()->number : '--';
142 142
                         })
143
-                        ->addColumn('date', function ($model) {
143
+                        ->addColumn('date', function($model) {
144 144
                             $date = $model->created_at;
145 145
                             $date1 = new \DateTime($date);
146 146
                             $date = $date1->format('M j, Y, g:i a ');
147 147
 
148 148
                             return $date;
149 149
                         })
150
-                        ->addColumn('payment_method', function ($model) {
150
+                        ->addColumn('payment_method', function($model) {
151 151
                             return $model->payment_method;
152 152
                         })
153 153
 
154
-                         ->addColumn('total', function ($model) use ($client, $extraAmt) {
154
+                         ->addColumn('total', function($model) use ($client, $extraAmt) {
155 155
                              if ($model->invoice_id == 0) {
156 156
                                  $amount = currency_format($extraAmt, $code = $client->currency);
157 157
                              } else {
@@ -160,11 +160,11 @@  discard block
 block discarded – undo
160 160
 
161 161
                              return $amount;
162 162
                          })
163
-                         ->addColumn('status', function ($model) {
163
+                         ->addColumn('status', function($model) {
164 164
                              return ucfirst($model->payment_status);
165 165
                          })
166 166
 
167
-                         ->addColumn('action', function ($model) {
167
+                         ->addColumn('action', function($model) {
168 168
                              '<input type="hidden" class="paymentid" value="{{$model->id}}">';
169 169
                              if ($model->invoice_id == 0) {
170 170
                                  return '<a href='.url('payments/'.$model->id.'/edit/')." class='btn btn-sm btn-primary btn-xs'> <i class='fa fa-edit' style='color:white;'> </i>&nbsp;&nbsp;Edit</a>";
Please login to merge, or discard this patch.
app/Http/Controllers/Product/ExtendedBaseProductController.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -19,28 +19,28 @@  discard block
 block discarded – undo
19 19
         ->get();
20 20
 
21 21
         return \DataTables::of($new_upload)
22
-        ->addColumn('checkbox', function ($model) {
22
+        ->addColumn('checkbox', function($model) {
23 23
             return "<input type='checkbox' class='upload_checkbox' value=".$model->id.' name=select[] id=checks>';
24 24
         })
25 25
 
26
-        ->addColumn('product_id', function ($model) {
26
+        ->addColumn('product_id', function($model) {
27 27
             return ucfirst($this->product->where('id', $model->product_id)->first()->name);
28 28
         })
29 29
 
30
-        ->addColumn('title', function ($model) {
30
+        ->addColumn('title', function($model) {
31 31
             return ucfirst($model->title);
32 32
         })
33
-        ->addColumn('description', function ($model) {
33
+        ->addColumn('description', function($model) {
34 34
             return ucfirst($model->description);
35 35
         })
36
-        ->addColumn('version', function ($model) {
36
+        ->addColumn('version', function($model) {
37 37
             return $model->version;
38 38
         })
39 39
 
40
-        ->addColumn('file', function ($model) {
40
+        ->addColumn('file', function($model) {
41 41
             return $model->file;
42 42
         })
43
-        ->addColumn('action', function ($model) {
43
+        ->addColumn('action', function($model) {
44 44
            return "<p><button data-toggle='modal' 
45 45
              data-id=".$model->id." data-title='$model->title' data-description='$model->description' data-version='$model->version'data-file='$model->file'
46 46
              class='btn btn-sm btn-primary btn-xs editUploadsOption'><i class='fa fa-edit'
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 
66 66
         try {
67 67
             $file_upload = ProductUpload::find($id);
68
-            $file_upload->where('id',$id)->update(['title'=>$request->input('producttitle'), 'description'=>$request->input('description'), 'version'=> $request->input('version')]);
68
+            $file_upload->where('id', $id)->update(['title'=>$request->input('producttitle'), 'description'=>$request->input('description'), 'version'=> $request->input('version')]);
69 69
             $autoUpdateStatus = StatusSetting::pluck('update_settings')->first();
70 70
             if ($autoUpdateStatus == 1) { //If License Setting Status is on,Add Product to the AutoUpdate Script
71 71
                 $productSku = $file_upload->product->product_sku;
Please login to merge, or discard this patch.
app/Http/Controllers/Front/CheckoutController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -188,7 +188,7 @@
 block discarded – undo
188 188
 
189 189
     public function postCheckout(Request $request)
190 190
     {
191
-        $this->validate($request,[
191
+        $this->validate($request, [
192 192
             'payment_gateway'=>'required',
193 193
         ]);
194 194
         $invoice_controller = new \App\Http\Controllers\Order\InvoiceController();
Please login to merge, or discard this patch.
app/Http/Controllers/Order/RenewController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -263,7 +263,7 @@
 block discarded – undo
263 263
             $productid = $sub->product_id;
264 264
             $plans = $this->plan->pluck('name', 'id')->toArray();
265 265
 
266
-            return view('themes.default1.renew.renew', compact('id','productid', 'plans', 'userid'));
266
+            return view('themes.default1.renew.renew', compact('id', 'productid', 'plans', 'userid'));
267 267
         } catch (Exception $ex) {
268 268
             return redirect()->back()->with('fails', $ex->getMessage());
269 269
         }
Please login to merge, or discard this patch.
app/Http/Controllers/Order/BaseRenewController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@
 block discarded – undo
108 108
             if ($code != '') {
109 109
                 $product_cost = $controller->checkCode($code, $product->id, $currency);
110 110
             }
111
-            $renewalPrice = $cost;//Get Renewal Price before calculating tax over it to save as regular price of product
111
+            $renewalPrice = $cost; //Get Renewal Price before calculating tax over it to save as regular price of product
112 112
             $cost = $this->tax($product, $renewalPrice, $user->id);
113 113
             $currency = $this->getUserCurrencyById($user->id);
114 114
             $number = rand(11111111, 99999999);
Please login to merge, or discard this patch.
app/Http/Controllers/Order/OrderController.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -105,16 +105,16 @@  discard block
 block discarded – undo
105 105
 
106 106
         return \DataTables::of($query->take(50))
107 107
                         ->setTotalRecords($query->count())
108
-                        ->addColumn('checkbox', function ($model) {
108
+                        ->addColumn('checkbox', function($model) {
109 109
                             return "<input type='checkbox' class='order_checkbox' value=".
110 110
                             $model->id.' name=select[] id=check>';
111 111
                         })
112
-                        ->addColumn('date', function ($model) {
112
+                        ->addColumn('date', function($model) {
113 113
                             $date = $model->created_at;
114 114
 
115 115
                             return "<span style='display:none'>$model->id</span>".$date;
116 116
                         })
117
-                        ->addColumn('client', function ($model) {
117
+                        ->addColumn('client', function($model) {
118 118
                             $user = $this->user->where('id', $model->client)->first();
119 119
                             $first = $user->first_name;
120 120
                             $last = $user->last_name;
@@ -122,59 +122,59 @@  discard block
 block discarded – undo
122 122
 
123 123
                             return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'<a>';
124 124
                         })
125
-                        ->addColumn('productname', function ($model) {
125
+                        ->addColumn('productname', function($model) {
126 126
                             $productid = ($model->product);
127 127
                             $productName = Product::where('id', $productid)->pluck('name')->first();
128 128
 
129 129
                             return $productName;
130 130
                         })
131
-                        ->addColumn('number', function ($model) {
131
+                        ->addColumn('number', function($model) {
132 132
                             return ucfirst($model->number);
133 133
                         })
134
-                        ->addColumn('price_override', function ($model) {
134
+                        ->addColumn('price_override', function($model) {
135 135
                             $currency = $model->user()->find($model->client)->currency;
136
-                            return currency_format($model->price_override,$code = $currency);
136
+                            return currency_format($model->price_override, $code = $currency);
137 137
                         })
138
-                        ->addColumn('order_status', function ($model) {
138
+                        ->addColumn('order_status', function($model) {
139 139
                             return ucfirst($model->order_status);
140 140
                         })
141 141
                         // ->showColumns('number', 'price_override', 'order_status')
142
-                        ->addColumn('update_ends_at', function ($model) {
142
+                        ->addColumn('update_ends_at', function($model) {
143 143
                             $end = $this->getEndDate($model);
144 144
 
145 145
                             return $end;
146 146
                         })
147
-                        ->addColumn('action', function ($model) {
147
+                        ->addColumn('action', function($model) {
148 148
                             $sub = $model->subscription()->first();
149 149
                             $status = $this->checkInvoiceStatusByOrderId($model->id);
150 150
                             $url = $this->getUrl($model, $status, $sub);
151 151
                             return $url;
152 152
                         })
153 153
 
154
-                         ->filterColumn('created_at', function ($query, $keyword) {
154
+                         ->filterColumn('created_at', function($query, $keyword) {
155 155
                              $sql = 'created_at like ?';
156 156
                              $query->whereRaw($sql, ["%{$keyword}%"]);
157 157
                          })
158 158
 
159
-                          ->filterColumn('client', function ($query, $keyword) {
159
+                          ->filterColumn('client', function($query, $keyword) {
160 160
                               $sql = 'client like ?';
161 161
                               $query->whereRaw($sql, ["%{$keyword}%"]);
162 162
                           })
163 163
 
164
-                           ->filterColumn('number', function ($query, $keyword) {
164
+                           ->filterColumn('number', function($query, $keyword) {
165 165
                                $sql = 'number like ?';
166 166
                                $query->whereRaw($sql, ["%{$keyword}%"]);
167 167
                            })
168
-                            ->filterColumn('price_override', function ($query, $keyword) {
168
+                            ->filterColumn('price_override', function($query, $keyword) {
169 169
                                 $sql = 'price_override like ?';
170 170
                                 $query->whereRaw($sql, ["%{$keyword}%"]);
171 171
                             })
172
-                             ->filterColumn('order_status', function ($query, $keyword) {
172
+                             ->filterColumn('order_status', function($query, $keyword) {
173 173
                                  $sql = 'order_status like ?';
174 174
                                  $query->whereRaw($sql, ["%{$keyword}%"]);
175 175
                              })
176 176
 
177
-                              ->filterColumn('update_ends_at', function ($query, $keyword) {
177
+                              ->filterColumn('update_ends_at', function($query, $keyword) {
178 178
                                   $sql = 'update_ends_at like ?';
179 179
                                   $query->whereRaw($sql, ["%{$keyword}%"]);
180 180
                               })
Please login to merge, or discard this patch.