@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | ." class='btn btn-sm btn-primary btn-xs'><i class='fa fa-edit' |
| 88 | 88 | style='color:white;'> </i> Edit</a>"; |
| 89 | 89 | }) |
| 90 | - ->rawColumns(['checkbox', 'code', 'products', 'action']) |
|
| 90 | + ->rawColumns(['checkbox', 'code', 'products', 'action']) |
|
| 91 | 91 | |
| 92 | 92 | ->make(true); |
| 93 | 93 | } |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | ->pluck('product_id', 'product_id')->toArray(); |
| 150 | 150 | |
| 151 | 151 | return view('themes.default1.payment.promotion.edit', |
| 152 | - compact('product', 'promotion', 'selectedProduct', 'type')); |
|
| 152 | + compact('product', 'promotion', 'selectedProduct', 'type')); |
|
| 153 | 153 | } catch (\Exception $ex) { |
| 154 | 154 | return redirect()->back()->with('fails', $ex->getMessage()); |
| 155 | 155 | } |
@@ -255,12 +255,12 @@ discard block |
||
| 255 | 255 | |
| 256 | 256 | $userId = \Auth::user()->id; |
| 257 | 257 | \Cart::update($productid, [ |
| 258 | - 'id' => $productid, |
|
| 259 | - 'price' => $value, |
|
| 260 | - 'conditions' => $coupon, |
|
| 258 | + 'id' => $productid, |
|
| 259 | + 'price' => $value, |
|
| 260 | + 'conditions' => $coupon, |
|
| 261 | 261 | |
| 262 | - // new item price, price can also be a string format like so: '98.67' |
|
| 263 | - ]); |
|
| 262 | + // new item price, price can also be a string format like so: '98.67' |
|
| 263 | + ]); |
|
| 264 | 264 | $items = \Cart::getContent(); |
| 265 | 265 | \Session::put('items', $items); |
| 266 | 266 | |
@@ -168,9 +168,9 @@ |
||
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | return \DataTables::of($invoices->get()) |
| 171 | - ->addColumn('number', function ($model) { |
|
| 172 | - return $model->number; |
|
| 173 | - }) |
|
| 171 | + ->addColumn('number', function ($model) { |
|
| 172 | + return $model->number; |
|
| 173 | + }) |
|
| 174 | 174 | ->addColumn('products', function ($model) { |
| 175 | 175 | $invoice = $this->invoice->find($model->id); |
| 176 | 176 | $products = $invoice->invoiceItem()->pluck('product_name')->toArray(); |
@@ -275,7 +275,7 @@ |
||
| 275 | 275 | $data = $template->data; |
| 276 | 276 | $replace = [ |
| 277 | 277 | 'name' => $user->first_name.' '.$user->last_name, |
| 278 | - 'serialkeyurl' => $myaccounturl, |
|
| 278 | + 'serialkeyurl' => $myaccounturl, |
|
| 279 | 279 | 'downloadurl' => $downloadurl, |
| 280 | 280 | 'invoiceurl' => $invoiceurl, |
| 281 | 281 | 'product' => $product, |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | return '<a href='.('#edit-upload-option/'.$model->id).' |
| 45 | 45 | class=" btn btn-sm btn-primary " data-title="'.$model->title.'" |
| 46 | 46 | data-description="'.$model->description.'" data-version="' |
| 47 | - .$model->version.'" data-id="'.$model->id.'" data-file="'.$model->file.'"onclick="openEditPopup(this)" >Edit</a>'; |
|
| 47 | + .$model->version.'" data-id="'.$model->id.'" data-file="'.$model->file.'"onclick="openEditPopup(this)" >Edit</a>'; |
|
| 48 | 48 | }) |
| 49 | 49 | ->rawcolumns(['checkbox', 'product_id', 'title', 'description', 'version', 'file', 'action']) |
| 50 | 50 | ->make(true); |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | if ($product->require_domain == 1) { |
| 104 | 104 | $field .= "<div class='col-md-4 form-group'> |
| 105 | 105 | <label class='required'>"./* @scrutinizer ignore-type */ |
| 106 | - \Lang::get('message.domain')."</label> |
|
| 106 | + \Lang::get('message.domain')."</label> |
|
| 107 | 107 | <input type='text' name='domain' class='form-control' |
| 108 | 108 | id='domain' placeholder='http://example.com'> |
| 109 | 109 | </div>"; |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | $serial_key = $this->checkSerialKey($faveo_encrypted_key, $order_number); |
| 96 | 96 | |
| 97 | 97 | \Log::emergency(json_encode(['domain' => $request->input('domain'), |
| 98 | - 'serial' => $serial_key, 'order' => $order_number, ])); |
|
| 98 | + 'serial' => $serial_key, 'order' => $order_number, ])); |
|
| 99 | 99 | $result = []; |
| 100 | 100 | if ($request_type == 'install') { |
| 101 | 101 | $result = $this->verificationResult($order_number, $serial_key); |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | ->value('serial_key'); |
| 350 | 350 | |
| 351 | 351 | $this_order = $order |
| 352 | - ->where('number', $faveo_encrypted_order_number) |
|
| 352 | + ->where('number', $faveo_encrypted_order_number) |
|
| 353 | 353 | ->first(); |
| 354 | 354 | if ($this_order && $orderSerialKey == $faveo_serial_key) { |
| 355 | 355 | $product_id = $this_order->product; |
@@ -77,7 +77,7 @@ |
||
| 77 | 77 | style='color:white;'> </i> Edit</a>"; |
| 78 | 78 | }) |
| 79 | 79 | |
| 80 | - ->rawColumns(['checkbox', 'name', 'url', 'created_at', 'action']) |
|
| 80 | + ->rawColumns(['checkbox', 'name', 'url', 'created_at', 'action']) |
|
| 81 | 81 | ->make(true); |
| 82 | 82 | // ->searchColumns('name', 'content') |
| 83 | 83 | // ->orderColumns('name') |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | |
| 145 | 145 | $order_id = $order->id; |
| 146 | 146 | $updatesEndDate = Subscription::select('update_ends_at') |
| 147 | - ->where('product_id', $productid)->where('order_id', $order_id)->first(); |
|
| 147 | + ->where('product_id', $productid)->where('order_id', $order_id)->first(); |
|
| 148 | 148 | if ($updatesEndDate) { |
| 149 | 149 | foreach ($versions as $version) { |
| 150 | 150 | if ($version->created_at->toDateTimeString() |
@@ -417,9 +417,9 @@ discard block |
||
| 417 | 417 | ->addColumn('payment_method', function ($model) { |
| 418 | 418 | return $model->payment_method; |
| 419 | 419 | }) |
| 420 | - ->addColumn('payment_status', function ($model) { |
|
| 421 | - return $model->payment_status; |
|
| 422 | - }) |
|
| 420 | + ->addColumn('payment_status', function ($model) { |
|
| 421 | + return $model->payment_status; |
|
| 422 | + }) |
|
| 423 | 423 | ->addColumn('created_at', function ($model) { |
| 424 | 424 | $date1 = new DateTime($model->created_at); |
| 425 | 425 | $tz = \Auth::user()->timezone()->first()->name; |
@@ -429,7 +429,7 @@ discard block |
||
| 429 | 429 | return $date; |
| 430 | 430 | }) |
| 431 | 431 | ->rawColumns(['checkbox', 'number', 'amount', |
| 432 | - 'payment_method', 'payment_status', 'created_at', ]) |
|
| 432 | + 'payment_method', 'payment_status', 'created_at', ]) |
|
| 433 | 433 | ->make(true); |
| 434 | 434 | } catch (Exception $ex) { |
| 435 | 435 | Bugsnag::notifyException($ex); |
@@ -455,17 +455,17 @@ discard block |
||
| 455 | 455 | ->addColumn('number', function ($model) { |
| 456 | 456 | return $model->invoice()->first()->number; |
| 457 | 457 | }) |
| 458 | - ->addColumn('total', function ($model) { |
|
| 459 | - return $model->amount; |
|
| 460 | - }) |
|
| 461 | - ->addColumn('created_at', function ($model) { |
|
| 462 | - $date1 = new DateTime($model->created_at); |
|
| 463 | - $tz = \Auth::user()->timezone()->first()->name; |
|
| 464 | - $date1->setTimezone(new DateTimeZone($tz)); |
|
| 465 | - $date = $date1->format('M j, Y, g:i a'); |
|
| 466 | - |
|
| 467 | - return $date; |
|
| 468 | - }) |
|
| 458 | + ->addColumn('total', function ($model) { |
|
| 459 | + return $model->amount; |
|
| 460 | + }) |
|
| 461 | + ->addColumn('created_at', function ($model) { |
|
| 462 | + $date1 = new DateTime($model->created_at); |
|
| 463 | + $tz = \Auth::user()->timezone()->first()->name; |
|
| 464 | + $date1->setTimezone(new DateTimeZone($tz)); |
|
| 465 | + $date = $date1->format('M j, Y, g:i a'); |
|
| 466 | + |
|
| 467 | + return $date; |
|
| 468 | + }) |
|
| 469 | 469 | |
| 470 | 470 | ->addColumn('payment_method', 'payment_status', 'created_at') |
| 471 | 471 | |
@@ -32,30 +32,30 @@ discard block |
||
| 32 | 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) { |
|
| 36 | - $payment = \App\Model\Order\Payment::where('invoice_id', $model->id)->select('amount')->get(); |
|
| 37 | - $c = count($payment); |
|
| 38 | - $sum = 0; |
|
| 39 | - for ($i = 0; $i <= $c - 1; $i++) { |
|
| 40 | - $sum = $sum + $payment[$i]->amount; |
|
| 41 | - } |
|
| 42 | - |
|
| 43 | - return currency_format($sum, $code = $client->currency); |
|
| 44 | - }) |
|
| 45 | - ->addColumn('balance', function ($model) use ($client) { |
|
| 46 | - $payment = \App\Model\Order\Payment::where('invoice_id', $model->id)->select('amount')->get(); |
|
| 47 | - $c = count($payment); |
|
| 48 | - $sum = 0; |
|
| 49 | - for ($i = 0; $i <= $c - 1; $i++) { |
|
| 50 | - $sum = $sum + $payment[$i]->amount; |
|
| 51 | - } |
|
| 52 | - $pendingAmount = ($model->grand_total) - ($sum); |
|
| 53 | - |
|
| 54 | - return currency_format($pendingAmount, $code = $client->currency); |
|
| 55 | - }) |
|
| 56 | - ->addColumn('status', function ($model) { |
|
| 57 | - return $model->status; |
|
| 58 | - }) |
|
| 35 | + ->addColumn('paid', function ($model) use ($client) { |
|
| 36 | + $payment = \App\Model\Order\Payment::where('invoice_id', $model->id)->select('amount')->get(); |
|
| 37 | + $c = count($payment); |
|
| 38 | + $sum = 0; |
|
| 39 | + for ($i = 0; $i <= $c - 1; $i++) { |
|
| 40 | + $sum = $sum + $payment[$i]->amount; |
|
| 41 | + } |
|
| 42 | + |
|
| 43 | + return currency_format($sum, $code = $client->currency); |
|
| 44 | + }) |
|
| 45 | + ->addColumn('balance', function ($model) use ($client) { |
|
| 46 | + $payment = \App\Model\Order\Payment::where('invoice_id', $model->id)->select('amount')->get(); |
|
| 47 | + $c = count($payment); |
|
| 48 | + $sum = 0; |
|
| 49 | + for ($i = 0; $i <= $c - 1; $i++) { |
|
| 50 | + $sum = $sum + $payment[$i]->amount; |
|
| 51 | + } |
|
| 52 | + $pendingAmount = ($model->grand_total) - ($sum); |
|
| 53 | + |
|
| 54 | + return currency_format($pendingAmount, $code = $client->currency); |
|
| 55 | + }) |
|
| 56 | + ->addColumn('status', function ($model) { |
|
| 57 | + return $model->status; |
|
| 58 | + }) |
|
| 59 | 59 | ->addColumn('action', function ($model) { |
| 60 | 60 | $action = ''; |
| 61 | 61 | $cont = new \App\Http\Controllers\Order\TaxRatesAndCodeExpiryController(); |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | style='color:white;'> </i> View</a>" |
| 77 | 77 | ." $editAction $action"; |
| 78 | 78 | }) |
| 79 | - ->rawColumns(['checkbox', 'date', 'invoice_no', 'total', 'paid', 'balance', 'status', 'action']) |
|
| 79 | + ->rawColumns(['checkbox', 'date', 'invoice_no', 'total', 'paid', 'balance', 'status', 'action']) |
|
| 80 | 80 | ->make(true); |
| 81 | 81 | } |
| 82 | 82 | |
@@ -104,16 +104,16 @@ discard block |
||
| 104 | 104 | |
| 105 | 105 | return $number; |
| 106 | 106 | }) |
| 107 | - ->addColumn('total', function ($model) use ($client) { |
|
| 108 | - $price = currency_format($model->price_override, $code = $client->currency); |
|
| 107 | + ->addColumn('total', function ($model) use ($client) { |
|
| 108 | + $price = currency_format($model->price_override, $code = $client->currency); |
|
| 109 | 109 | |
| 110 | - return $price; |
|
| 111 | - }) |
|
| 112 | - ->addColumn('status', function ($model) { |
|
| 113 | - $status = $model->order_status; |
|
| 110 | + return $price; |
|
| 111 | + }) |
|
| 112 | + ->addColumn('status', function ($model) { |
|
| 113 | + $status = $model->order_status; |
|
| 114 | 114 | |
| 115 | - return $status; |
|
| 116 | - }) |
|
| 115 | + return $status; |
|
| 116 | + }) |
|
| 117 | 117 | ->addColumn('action', function ($model) { |
| 118 | 118 | return '<a href='.url('orders/'.$model->id)." |
| 119 | 119 | class='btn btn-sm btn-primary btn-xs'><i class='fa fa-eye' |
@@ -150,18 +150,18 @@ discard block |
||
| 150 | 150 | ->addColumn('payment_method', function ($model) { |
| 151 | 151 | return $model->payment_method; |
| 152 | 152 | }) |
| 153 | - ->addColumn('total', function ($model) use ($client,$extraAmt) { |
|
| 154 | - if ($model->invoice_id == 0) { |
|
| 155 | - $amount = currency_format($extraAmt, $code = $client->currency); |
|
| 156 | - } else { |
|
| 157 | - $amount = currency_format($model->amount, $code = $client->currency); |
|
| 158 | - } |
|
| 159 | - |
|
| 160 | - return $amount; |
|
| 161 | - }) |
|
| 162 | - ->addColumn('status', function ($model) { |
|
| 163 | - return ucfirst($model->payment_status); |
|
| 164 | - }) |
|
| 153 | + ->addColumn('total', function ($model) use ($client,$extraAmt) { |
|
| 154 | + if ($model->invoice_id == 0) { |
|
| 155 | + $amount = currency_format($extraAmt, $code = $client->currency); |
|
| 156 | + } else { |
|
| 157 | + $amount = currency_format($model->amount, $code = $client->currency); |
|
| 158 | + } |
|
| 159 | + |
|
| 160 | + return $amount; |
|
| 161 | + }) |
|
| 162 | + ->addColumn('status', function ($model) { |
|
| 163 | + return ucfirst($model->payment_status); |
|
| 164 | + }) |
|
| 165 | 165 | |
| 166 | 166 | ->rawColumns(['checkbox', 'invoice_no', 'date', 'payment_method', 'total', 'status']) |
| 167 | 167 | ->make(true); |
@@ -125,10 +125,10 @@ discard block |
||
| 125 | 125 | ->addColumn('name', function ($model) { |
| 126 | 126 | return ucfirst($model->name); |
| 127 | 127 | }) |
| 128 | - ->addColumn('image', function ($model) { |
|
| 129 | - // return $model->image; |
|
| 130 | - return "<img src= '$model->image' + height=\"80\"/>"; |
|
| 131 | - }) |
|
| 128 | + ->addColumn('image', function ($model) { |
|
| 129 | + // return $model->image; |
|
| 130 | + return "<img src= '$model->image' + height=\"80\"/>"; |
|
| 131 | + }) |
|
| 132 | 132 | ->addColumn('type', function ($model) { |
| 133 | 133 | if ($this->type->where('id', $model->type)->first()) { |
| 134 | 134 | return $this->type->where('id', $model->type)->first()->name; |
@@ -174,9 +174,9 @@ discard block |
||
| 174 | 174 | $this->validate($request, [ |
| 175 | 175 | 'producttitle' => 'required', |
| 176 | 176 | 'version' => 'required', |
| 177 | - 'filename' => 'required', |
|
| 178 | - ], |
|
| 179 | - ['filename.required' => 'Please Uplaod A file', |
|
| 177 | + 'filename' => 'required', |
|
| 178 | + ], |
|
| 179 | + ['filename.required' => 'Please Uplaod A file', |
|
| 180 | 180 | ]); |
| 181 | 181 | |
| 182 | 182 | try { |