Completed
Push — development ( 895d6a...1f768f )
by Ashutosh
08:56
created
app/Plugins/Paypal/views/settings.blade.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@
 block discarded – undo
64 64
                         <div class="pull-right">
65 65
 
66 66
                             <?php
67
-                            $status=0;
67
+                            $status = 0;
68 68
                             $cont = new \App\Plugins\Paypal\Model\Paypal();
69 69
                             $recentselected = $cont->find(1)->pluck('paypal_url')->first();
70 70
                             ?>
Please login to merge, or discard this patch.
app/Http/Controllers/Front/CheckoutController.php 1 patch
Braces   +10 added lines, -5 removed lines patch added patch discarded remove patch
@@ -80,7 +80,8 @@  discard block
 block discarded – undo
80 80
      */
81 81
     public function checkoutForm(Request $request)
82 82
     {
83
-        if (!\Auth::user()) {//If User is not Logged in then send him to login Page
83
+        if (!\Auth::user()) {
84
+//If User is not Logged in then send him to login Page
84 85
             $url = $request->segments(); //The requested url (chekout).Save it in Session
85 86
             \Session::put('session-url', $url[0]);
86 87
             $content = Cart::getContent();
@@ -106,7 +107,8 @@  discard block
 block discarded – undo
106 107
 
107 108
         try {
108 109
             $domain = $request->input('domain');
109
-            if ($domain) {//Store the Domain  in session when user Logged In
110
+            if ($domain) {
111
+//Store the Domain  in session when user Logged In
110 112
                 foreach ($domain as $key => $value) {
111 113
                     \Session::put('domain'.$key, $value);
112 114
                 }
@@ -131,7 +133,8 @@  discard block
 block discarded – undo
131 133
     public function getAttributes($content)
132 134
     {
133 135
         try {
134
-            if (count($content) > 0) {//after ProductPurchase this is not true as cart is cleared
136
+            if (count($content) > 0) {
137
+//after ProductPurchase this is not true as cart is cleared
135 138
                 foreach ($content as $key => $item) {
136 139
                     $attributes[] = $item->attributes;
137 140
                     $cart_currency = $attributes[0]['currency']['currency']; //Get the currency of Product in the cart
@@ -266,9 +269,11 @@  discard block
 block discarded – undo
266 269
                     \Event::fire(new \App\Events\PaymentGateway(['request' => $request, 'cart' => Cart::getContent(), 'order' => $invoice]));
267 270
                 }
268 271
             } else {
269
-                if ($paynow == false) {//Regular Payment for free Product
272
+                if ($paynow == false) {
273
+//Regular Payment for free Product
270 274
                     $action = $this->checkoutAction($invoice);
271
-                } else {//Renewal Payment for free Product
275
+                } else {
276
+//Renewal Payment for free Product
272 277
                     $control = new \App\Http\Controllers\Order\RenewController();
273 278
                     $control->successRenew($invoice);
274 279
                     $payment = new \App\Http\Controllers\Order\InvoiceController();
Please login to merge, or discard this patch.
app/Http/Middleware/Admin.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,8 @@
 block discarded – undo
47 47
             if ($url) {
48 48
                 $content = \Cart::getContent();
49 49
                 $currency = (\Session::get('currency'));
50
-                if (\Auth::user()->currency != $currency) {//If user currency is not equal to the cart currency then redirect to default url and clear his cart items and let the customer add the Product again so that the tax could be calculated properly
50
+                if (\Auth::user()->currency != $currency) {
51
+//If user currency is not equal to the cart currency then redirect to default url and clear his cart items and let the customer add the Product again so that the tax could be calculated properly
51 52
                     foreach ($content as $key => $item) {
52 53
                         $id = $item->id;
53 54
                         Cart::remove($id);
Please login to merge, or discard this patch.
app/Http/Controllers/Product/ExtendedBaseProductController.php 3 patches
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
             return $model->file;
43 43
         })
44 44
         ->addColumn('action', function ($model) {
45
-              return '<p><a href='.url('edit-upload/'.$model->id).
45
+                return '<p><a href='.url('edit-upload/'.$model->id).
46 46
                                 " class='btn btn-sm btn-primary btn-xs'><i class='fa fa-edit'
47 47
                                  style='color:white;'> </i>&nbsp;&nbsp;Edit</a>&nbsp</p>";
48 48
         })
@@ -50,14 +50,14 @@  discard block
 block discarded – undo
50 50
         ->make(true);
51 51
     }
52 52
 
53
-   /**
54
-    * Go to edit Product Upload Page
55
-    *
56
-    * @date   2019-03-07T13:15:58+0530
57
-    *
58
-    * @param  int $id   Product Upload id 
59
-    *
60
-    */
53
+    /**
54
+     * Go to edit Product Upload Page
55
+     *
56
+     * @date   2019-03-07T13:15:58+0530
57
+     *
58
+     * @param  int $id   Product Upload id 
59
+     *
60
+     */
61 61
     public function editProductUpload($id) 
62 62
     {
63 63
         $model = ProductUpload::where('id',$id)->first();
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
             if ($product->require_domain == 1) {
120 120
                 $field .= "<div class='col-md-4 form-group'>
121 121
                         <label class='required'>"./* @scrutinizer ignore-type */
122
-                         \Lang::get('message.domain')."</label>
122
+                            \Lang::get('message.domain')."</label>
123 123
                         <input type='text' name='domain' class='form-control' 
124 124
                         id='domain' placeholder='http://example.com'>
125 125
                 </div>";
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -20,28 +20,28 @@  discard block
 block discarded – undo
20 20
         ->get();
21 21
 
22 22
         return \DataTables::of($new_upload)
23
-        ->addColumn('checkbox', function ($model) {
23
+        ->addColumn('checkbox', function($model) {
24 24
             return "<input type='checkbox' class='upload_checkbox' value=".$model->id.' name=select[] id=checks>';
25 25
         })
26 26
 
27
-        ->addColumn('product_id', function ($model) {
27
+        ->addColumn('product_id', function($model) {
28 28
             return ucfirst($this->product->where('id', $model->product_id)->first()->name);
29 29
         })
30 30
 
31
-        ->addColumn('title', function ($model) {
31
+        ->addColumn('title', function($model) {
32 32
             return ucfirst($model->title);
33 33
         })
34
-        ->addColumn('description', function ($model) {
34
+        ->addColumn('description', function($model) {
35 35
             return ucfirst($model->description);
36 36
         })
37
-        ->addColumn('version', function ($model) {
37
+        ->addColumn('version', function($model) {
38 38
             return $model->version;
39 39
         })
40 40
 
41
-        ->addColumn('file', function ($model) {
41
+        ->addColumn('file', function($model) {
42 42
             return $model->file;
43 43
         })
44
-        ->addColumn('action', function ($model) {
44
+        ->addColumn('action', function($model) {
45 45
               return '<p><a href='.url('edit-upload/'.$model->id).
46 46
                                 " class='btn btn-sm btn-primary btn-xs'><i class='fa fa-edit'
47 47
                                  style='color:white;'> </i>&nbsp;&nbsp;Edit</a>&nbsp</p>";
@@ -60,9 +60,9 @@  discard block
 block discarded – undo
60 60
     */
61 61
     public function editProductUpload($id) 
62 62
     {
63
-        $model = ProductUpload::where('id',$id)->first();
63
+        $model = ProductUpload::where('id', $id)->first();
64 64
         $selectedProduct = $model->product->name;
65
-        return view('themes.default1.product.product.edit-upload-option',compact('model','selectedProduct'));
65
+        return view('themes.default1.product.product.edit-upload-option', compact('model', 'selectedProduct'));
66 66
     }
67 67
 
68 68
     //Update the File Info
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
                 $updateClassObj = new \App\Http\Controllers\AutoUpdate\AutoUpdateController();
83 83
                 $addProductToAutoUpdate = $updateClassObj->editVersion($request->input('version'), $productSku);
84 84
             }
85
-            return redirect()->back()->with('success','Product Updated Successfully');
85
+            return redirect()->back()->with('success', 'Product Updated Successfully');
86 86
         } catch (\Exception $ex) {
87 87
             app('log')->error($e->getMessage());
88 88
             Bugsnag::notifyException($e);
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
     * @param  int $id   Product Upload id 
59 59
     *
60 60
     */
61
-    public function editProductUpload($id) 
61
+    public function editProductUpload($id)
62 62
     {
63 63
         $model = ProductUpload::where('id',$id)->first();
64 64
         $selectedProduct = $model->product->name;
@@ -77,7 +77,8 @@  discard block
 block discarded – undo
77 77
             $file_upload = ProductUpload::find($id);
78 78
             $file_upload->where('id', $id)->update(['title'=>$request->input('title'), 'description'=>$request->input('description'), 'version'=> $request->input('version')]);
79 79
             $autoUpdateStatus = StatusSetting::pluck('update_settings')->first();
80
-            if ($autoUpdateStatus == 1) { //If License Setting Status is on,Add Product to the AutoUpdate Script
80
+            if ($autoUpdateStatus == 1) {
81
+//If License Setting Status is on,Add Product to the AutoUpdate Script
81 82
                 $productSku = $file_upload->product->product_sku;
82 83
                 $updateClassObj = new \App\Http\Controllers\AutoUpdate\AutoUpdateController();
83 84
                 $addProductToAutoUpdate = $updateClassObj->editVersion($request->input('version'), $productSku);
Please login to merge, or discard this patch.