Completed
Push — development ( 00627b...6692d3 )
by Ashutosh
22:08 queued 10:22
created
app/Http/Controllers/Order/BaseRenewController.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@
 block discarded – undo
123 123
             ]);
124 124
             $this->createOrderInvoiceRelation($orderid, $invoice->id);
125 125
             $items = $controller->createInvoiceItemsByAdmin($invoice->id, $product->id,
126
-             $code, $renewalPrice, $currency, $qty = 1, $agents);
126
+                $code, $renewalPrice, $currency, $qty = 1, $agents);
127 127
 
128 128
             return $items;
129 129
         } catch (Exception $ex) {
Please login to merge, or discard this patch.
app/Http/Controllers/Product/ExtendedBaseProductController.php 3 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -47,9 +47,9 @@  discard block
 block discarded – undo
47 47
              style='color:white;'> </i>&nbsp;&nbsp;Edit</button>&nbsp;</p>";
48 48
 
49 49
             //    return '<a href='.('#edit-upload-option/'.$model->id).'
50
-         // class=" btn btn-sm btn-primary editupload" data-title="'.$model->title.'"
51
-         //  data-description="'.$model->description.'" data-version="'
52
-         //      .$model->version.'" data-id="'.$model->id.'" data-file="'.$model->file.'"onclick="openEditPopup(this)" >Edit</a>';
50
+            // class=" btn btn-sm btn-primary editupload" data-title="'.$model->title.'"
51
+            //  data-description="'.$model->description.'" data-version="'
52
+            //      .$model->version.'" data-id="'.$model->id.'" data-file="'.$model->file.'"onclick="openEditPopup(this)" >Edit</a>';
53 53
         })
54 54
         ->rawcolumns(['checkbox', 'product_id', 'title', 'description', 'version', 'file', 'action'])
55 55
         ->make(true);
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
             if ($product->require_domain == 1) {
112 112
                 $field .= "<div class='col-md-4 form-group'>
113 113
                         <label class='required'>"./* @scrutinizer ignore-type */
114
-                         \Lang::get('message.domain')."</label>
114
+                            \Lang::get('message.domain')."</label>
115 115
                         <input type='text' name='domain' class='form-control' 
116 116
                         id='domain' placeholder='http://example.com'>
117 117
                 </div>";
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -19,28 +19,28 @@
 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'
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,8 @@
 block discarded – undo
67 67
             $file_upload = ProductUpload::find($id);
68 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
-            if ($autoUpdateStatus == 1) { //If License Setting Status is on,Add Product to the AutoUpdate Script
70
+            if ($autoUpdateStatus == 1) {
71
+//If License Setting Status is on,Add Product to the AutoUpdate Script
71 72
                 $productSku = $file_upload->product->product_sku;
72 73
                 $updateClassObj = new \App\Http\Controllers\AutoUpdate\AutoUpdateController();
73 74
                 $addProductToAutoUpdate = $updateClassObj->editVersion($request->input('version'), $productSku);
Please login to merge, or discard this patch.
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.