Completed
Push — development ( 193319...2810c0 )
by Ashutosh
12:04 queued 01:59
created
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   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -119,7 +119,7 @@
 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   +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><a href='.url('edit-upload/'.$model->id).
45 45
                                 " class='btn btn-sm btn-primary btn-xs'><i class='fa fa-edit'
46 46
                                  style='color:white;'> </i>&nbsp;&nbsp;Edit</a>&nbsp</p>";
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -76,7 +76,8 @@
 block discarded – undo
76 76
             $file_upload = ProductUpload::find($id);
77 77
             $file_upload->where('id', $id)->update(['title'=>$request->input('title'), 'description'=>$request->input('description'), 'version'=> $request->input('version')]);
78 78
             $autoUpdateStatus = StatusSetting::pluck('update_settings')->first();
79
-            if ($autoUpdateStatus == 1) { //If License Setting Status is on,Add Product to the AutoUpdate Script
79
+            if ($autoUpdateStatus == 1) {
80
+//If License Setting Status is on,Add Product to the AutoUpdate Script
80 81
                 $productSku = $file_upload->product->product_sku;
81 82
                 $updateClassObj = new \App\Http\Controllers\AutoUpdate\AutoUpdateController();
82 83
                 $addProductToAutoUpdate = $updateClassObj->editVersion($request->input('version'), $productSku);
Please login to merge, or discard this patch.
app/Model/Common/State.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
         'state_subdivision_id', 'country_code_char2',
14 14
         'country_code_char3', 'state_subdivision_name',
15 15
         'state_subdivision_alternate_names', 'primary_level_name',
16
-         'state_subdivision_code',
16
+            'state_subdivision_code',
17 17
     ];
18 18
 
19 19
     public $timestamps = false;
Please login to merge, or discard this patch.
app/Http/Kernel.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -17,10 +17,10 @@  discard block
 block discarded – undo
17 17
         \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
18 18
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
19 19
         // \App\Http\Middleware\TrimStrings::class,
20
-          \Illuminate\Session\Middleware\StartSession::class,
21
-             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
22
-              // \Voerro\Laravel\VisitorTracker\Middleware\RecordVisits::class,
23
-              // \Torann\Currency\Middleware\CurrencyMiddleware::class,
20
+            \Illuminate\Session\Middleware\StartSession::class,
21
+                \Illuminate\View\Middleware\ShareErrorsFromSession::class,
22
+                // \Voerro\Laravel\VisitorTracker\Middleware\RecordVisits::class,
23
+                // \Torann\Currency\Middleware\CurrencyMiddleware::class,
24 24
         // \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
25 25
     ];
26 26
 
@@ -31,21 +31,21 @@  discard block
 block discarded – undo
31 31
      */
32 32
     protected $middlewareGroups = [
33 33
         'web' => [
34
-             \App\Http\Middleware\Install::class,
34
+                \App\Http\Middleware\Install::class,
35 35
             \App\Http\Middleware\EncryptCookies::class,
36 36
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
37 37
             // \Illuminate\Session\Middleware\StartSession::class,
38 38
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
39 39
             // \Illuminate\View\Middleware\ShareErrorsFromSession::class,
40
-           // \App\Http\Middleware\VerifyCsrfToken::class,
40
+            // \App\Http\Middleware\VerifyCsrfToken::class,
41 41
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
42 42
             \Barryvdh\Cors\HandleCors::class,
43
-             // \App\Http\Middleware\IsInstalled::class,
43
+                // \App\Http\Middleware\IsInstalled::class,
44 44
 
45 45
         ],
46
-         'admin'        => [\App\Http\Middleware\Admin::class],
47
-          'guest'       => [\App\Http\Middleware\RedirectIfAuthenticated::class],
48
-           'auth'       => [\Illuminate\Auth\Middleware\Authenticate::class],
46
+            'admin'        => [\App\Http\Middleware\Admin::class],
47
+            'guest'       => [\App\Http\Middleware\RedirectIfAuthenticated::class],
48
+            'auth'       => [\Illuminate\Auth\Middleware\Authenticate::class],
49 49
         'auth.basic'    => [\Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class],
50 50
 
51 51
         'api' => [
Please login to merge, or discard this patch.
app/Http/Controllers/Auth/AuthController.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -72,10 +72,12 @@  discard block
 block discarded – undo
72 72
                 $pipedriveStatus = StatusSetting::pluck('pipedrive_status')->first();
73 73
                 $zohoStatus = StatusSetting::pluck('zoho_status')->first();
74 74
                 $mailchimpStatus = StatusSetting::pluck('mailchimp_status')->first();
75
-                if ($pipedriveStatus == 1) {//Add to Pipedrive
75
+                if ($pipedriveStatus == 1) {
76
+//Add to Pipedrive
76 77
                     $this->addToPipedrive($user);
77 78
                 }
78
-                if ($zohoStatus) {//Add to Zoho
79
+                if ($zohoStatus) {
80
+//Add to Zoho
79 81
                     $zoho = $this->reqFields($user, $email);
80 82
                     $auth = ApiKey::where('id', 1)->value('zoho_api_key');
81 83
                     $zohoUrl = 'https://crm.zoho.com/crm/private/xml/Leads/insertRecords??duplicateCheck=1&';
@@ -98,7 +100,8 @@  discard block
 block discarded – undo
98 100
                     curl_close($ch);
99 101
                 }
100 102
 
101
-                if ($mailchimpStatus == 1) {//Add to Mailchimp
103
+                if ($mailchimpStatus == 1) {
104
+//Add to Mailchimp
102 105
                     $mailchimp = new \App\Http\Controllers\Common\MailChimpController();
103 106
                     $r = $mailchimp->addSubscriber($user->email);
104 107
                 }
Please login to merge, or discard this patch.