@@ -46,7 +46,7 @@ |
||
| 46 | 46 | return view('themes.default1.common.dashboard', compact('totalSalesINR', 'totalSalesUSD', |
| 47 | 47 | 'yearlySalesINR', 'yearlySalesUSD', 'monthlySalesINR', 'monthlySalesUSD', 'users', |
| 48 | 48 | |
| 49 | - 'count_users', 'arraylists', 'productSoldlists','orders','subscriptions','invoices', |
|
| 49 | + 'count_users', 'arraylists', 'productSoldlists', 'orders', 'subscriptions', 'invoices', |
|
| 50 | 50 | 'products', 'arrayCountList')); |
| 51 | 51 | } |
| 52 | 52 | |
@@ -54,8 +54,8 @@ discard block |
||
| 54 | 54 | return view('themes.default1.common.dashboard', compact('totalSalesINR', 'totalSalesUSD', |
| 55 | 55 | 'yearlySalesINR', 'yearlySalesUSD', 'monthlySalesINR', 'monthlySalesUSD', 'users', |
| 56 | 56 | |
| 57 | - 'count_users', 'arraylists', 'productSoldlists','orders','subscriptions','invoices', |
|
| 58 | - 'products', 'arrayCountList')); |
|
| 57 | + 'count_users', 'arraylists', 'productSoldlists','orders','subscriptions','invoices', |
|
| 58 | + 'products', 'arrayCountList')); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | /** |
@@ -157,9 +157,9 @@ discard block |
||
| 157 | 157 | public function getAllUsers() |
| 158 | 158 | { |
| 159 | 159 | $allUsers = User::orderBy('created_at', 'desc')->where('active', 1)->where('mobile_verified', 1) |
| 160 | - ->take(20) |
|
| 161 | - ->get() |
|
| 162 | - ->toArray(); |
|
| 160 | + ->take(20) |
|
| 161 | + ->get() |
|
| 162 | + ->toArray(); |
|
| 163 | 163 | |
| 164 | 164 | return $allUsers; |
| 165 | 165 | } |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | $dayUtc = new Carbon('-30 days'); |
| 195 | 195 | $minus30Day = $dayUtc->toDateTimeString(); |
| 196 | 196 | $recentOrders = Order::where('created_at', '>', $minus30Day)->orderBy('created_at', 'desc') |
| 197 | - ->where('price_override', '>', 0)->get(); |
|
| 197 | + ->where('price_override', '>', 0)->get(); |
|
| 198 | 198 | |
| 199 | 199 | return $recentOrders; |
| 200 | 200 | } |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | public function getResult($country, $geoip_country, $state, $geoip_state, |
| 56 | - $shop, $cart, $cart1, $shop1, $rate, $product, $price) |
|
| 56 | + $shop, $cart, $cart1, $shop1, $rate, $product, $price) |
|
| 57 | 57 | { |
| 58 | 58 | if ($country == $geoip_country || $state == $geoip_state || ($country == '' && $state == '')) { |
| 59 | 59 | $result = $this->getCartResult($product, $shop, $cart, $rate, $price, $cart1, $shop1); |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | $user->profile_pic = $fileName; |
| 115 | 115 | } |
| 116 | 116 | $user->fill($request->input())->save(); |
| 117 | - $response = ['type' => 'success', 'message' =>'Updated Successfully..']; |
|
| 117 | + $response = ['type' => 'success', 'message' =>'Updated Successfully..']; |
|
| 118 | 118 | |
| 119 | 119 | return $response; |
| 120 | 120 | } catch (Exception $ex) { |
@@ -168,31 +168,31 @@ discard block |
||
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | return \DataTables::of($invoices->get()) |
| 171 | - ->addColumn('checkbox', function ($model) { |
|
| 171 | + ->addColumn('checkbox', function($model) { |
|
| 172 | 172 | return "<input type='checkbox' class='transaction_checkbox' |
| 173 | 173 | value=".$model->id.' name=select[] id=checks>'; |
| 174 | 174 | }) |
| 175 | - ->addColumn('number', function ($model) { |
|
| 175 | + ->addColumn('number', function($model) { |
|
| 176 | 176 | return $model->number; |
| 177 | 177 | }) |
| 178 | - ->addColumn('products', function ($model) { |
|
| 178 | + ->addColumn('products', function($model) { |
|
| 179 | 179 | $invoice = $this->invoice->find($model->id); |
| 180 | 180 | $products = $invoice->invoiceItem()->pluck('product_name')->toArray(); |
| 181 | 181 | |
| 182 | 182 | return ucfirst(implode(',', $products)); |
| 183 | 183 | }) |
| 184 | - ->addColumn('date', function ($model) { |
|
| 184 | + ->addColumn('date', function($model) { |
|
| 185 | 185 | $date = date_create($model->created_at); |
| 186 | 186 | |
| 187 | 187 | return date_format($date, 'M j, Y, g:i a'); |
| 188 | 188 | }) |
| 189 | - ->addColumn('total', function ($model) { |
|
| 189 | + ->addColumn('total', function($model) { |
|
| 190 | 190 | return $model->grand_total; |
| 191 | 191 | }) |
| 192 | - ->addColumn('status', function ($model) { |
|
| 192 | + ->addColumn('status', function($model) { |
|
| 193 | 193 | return ucfirst($model->status); |
| 194 | 194 | }) |
| 195 | - ->addColumn('action', function ($model) { |
|
| 195 | + ->addColumn('action', function($model) { |
|
| 196 | 196 | if (\Auth::user()->role == 'admin') { |
| 197 | 197 | $url = '/invoices/show?invoiceid='.$model->id; |
| 198 | 198 | } else { |