Completed
Push — development ( a5779d...ca32e0 )
by Ashutosh
19:36 queued 09:29
created
app/Http/Controllers/Common/MailChimpController.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
         try {
59 59
             $merge_fields = $this->field($email);
60 60
             $interestGroupIdForNo = $this->relation->is_paid_no; //Interest GroupId for IsPaid Is No
61
-              $interestGroupIdForYes = $this->relation->is_paid_yes; //Interest GroupId for IsPaid Is Yes
61
+                $interestGroupIdForYes = $this->relation->is_paid_yes; //Interest GroupId for IsPaid Is Yes
62 62
             $result = $this->mailchimp->post("lists/$this->list_id/members", [
63 63
                 'status'        => $this->mailchimp_set->subscribe_status,
64 64
                 'email_address' => $email,
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
             $country = Country::where('country_code_char2', $user->country)->pluck('nicename')->first();
115 115
             if ($user) {
116 116
                 $fields = ['first_name', 'last_name', 'company', 'mobile',
117
-                 'address', 'town', 'country', 'state', 'zip', 'active', 'role', 'source', ];
117
+                    'address', 'town', 'country', 'state', 'zip', 'active', 'role', 'source', ];
118 118
                 $relation = $this->relation;
119 119
                 $merge_fields = [];
120 120
                 foreach ($fields as $field) {
@@ -241,11 +241,11 @@  discard block
 block discarded – undo
241 241
 
242 242
             $this->addProductInterestFieldsToAgora(); //add all the fields in Product Section of Groups to the db
243 243
             $group_fields = $this->groups->where('list_id', $this->list_id)
244
-          ->select('category_name', 'category_option_id', 'category_id')->get()->toArray();
244
+            ->select('category_name', 'category_option_id', 'category_id')->get()->toArray();
245 245
             // dd($group_fields[0]);
246 246
             $relations = MailchimpGroupAgoraRelation::where('id', '!=', 0)
247
-          ->select('agora_product_id', 'mailchimp_group_cat_id')
248
-          ->orderBy('id', 'asc')->get()->toArray();
247
+            ->select('agora_product_id', 'mailchimp_group_cat_id')
248
+            ->orderBy('id', 'asc')->get()->toArray();
249 249
             $productList = [];
250 250
             $categoryList = [];
251 251
             if (count($relations) != 0) {
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
             MailchimpGroupAgoraRelation::where('id', '!=', 0)->delete();
325 325
             foreach ($request->row as $key => $value) {
326 326
                 MailchimpGroupAgoraRelation::create(['agora_product_id'=> $value[0],
327
-             'mailchimp_group_cat_id'                                  => $value[1], ]);
327
+                'mailchimp_group_cat_id'                                  => $value[1], ]);
328 328
             }
329 329
 
330 330
             return redirect()->back()->with('success', \Lang::get('message.updated-successfully'));
Please login to merge, or discard this patch.
app/Http/Controllers/Front/ExtendedBaseCartController.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -135,18 +135,21 @@
 block discarded – undo
135 135
             if ($this->checkPlanSession() === true) {
136 136
                 $planid = Session::get('plan');
137 137
             }
138
-            if (!$planid) {//When Product Is Added from Cart
138
+            if (!$planid) {
139
+//When Product Is Added from Cart
139 140
                 $planid = Plan::where('product', $productid)->pluck('id')->first();
140 141
             }
141 142
             $plan = Plan::where('id', $planid)->where('product', $productid)->first();
142
-            if ($plan) { //Get the Total Plan Cost if the Plan Exists For a Product
143
+            if ($plan) {
144
+//Get the Total Plan Cost if the Plan Exists For a Product
143 145
                 $months = 1;
144 146
                 $cont = new CartController();
145 147
                 $currency = $cont->currency($userid);
146 148
                 $product = Product::find($productid);
147 149
                 $days = $plan->periods->pluck('days')->first();
148 150
                 $price = ($product->planRelation->find($planid)->planPrice->where('currency', $currency['currency'])->first()->add_price);
149
-                if ($days) { //If Period Is defined for a Particular Plan ie no. of Days Generated
151
+                if ($days) {
152
+//If Period Is defined for a Particular Plan ie no. of Days Generated
150 153
                     $months = $days >= '365' ? $days / 30 / 12 : $days / 30;
151 154
                 }
152 155
                 $finalPrice = str_replace(',', '', $price);
Please login to merge, or discard this patch.
app/Http/Controllers/Product/GroupController.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -52,10 +52,10 @@  discard block
 block discarded – undo
52 52
         return\ DataTables::of($product_group)
53 53
         // return \Datatable::of($this->group->select('id', 'name')->get())
54 54
 
55
-                       ->addColumn('checkbox', function ($model) {
56
-                           return "<input type='checkbox' class='group_checkbox' 
55
+                        ->addColumn('checkbox', function ($model) {
56
+                            return "<input type='checkbox' class='group_checkbox' 
57 57
                             value=".$model->id.' name=select[] id=check>';
58
-                       })
58
+                        })
59 59
 
60 60
                         ->addColumn('name', function ($model) {
61 61
                             return ucfirst($model->name);
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
             'pricing_templates_id' => 'required',
102 102
             ], [
103 103
                 'pricing_templates_id.required'=> 'Please Select a Template',
104
-          ]);
104
+            ]);
105 105
 
106 106
         try {
107 107
             $this->group->fill($request->input())->save();
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -52,22 +52,22 @@
 block discarded – undo
52 52
         return\ DataTables::of($product_group)
53 53
         // return \Datatable::of($this->group->select('id', 'name')->get())
54 54
 
55
-                       ->addColumn('checkbox', function ($model) {
55
+                       ->addColumn('checkbox', function($model) {
56 56
                            return "<input type='checkbox' class='group_checkbox' 
57 57
                             value=".$model->id.' name=select[] id=check>';
58 58
                        })
59 59
 
60
-                        ->addColumn('name', function ($model) {
60
+                        ->addColumn('name', function($model) {
61 61
                             return ucfirst($model->name);
62 62
                         })
63 63
                         // ->showColumns('name')
64 64
 
65
-                        ->addColumn('action', function ($model) {
65
+                        ->addColumn('action', function($model) {
66 66
                             return '<a href='.url('groups/'.$model->id.'/edit').
67 67
                             " class='btn btn-sm btn-primary btn-xs'><i class='fa fa-edit' 
68 68
                             style='color:white;'> </i>&nbsp;&nbsp;Edit</a>";
69 69
                         })
70
-                        ->rawColumns(['checkbox', 'name',  'action'])
70
+                        ->rawColumns(['checkbox', 'name', 'action'])
71 71
                         ->make(true);
72 72
     }
73 73
 
Please login to merge, or discard this patch.
app/Http/Controllers/BaseHomeController.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@
 block discarded – undo
146 146
     public function checkUpdatesExpiry(Request $request)
147 147
     {
148 148
         $v = \Validator::make($request->all(), [
149
-          'order_number' => 'required',
149
+            'order_number' => 'required',
150 150
         ]);
151 151
         if ($v->fails()) {
152 152
             $error = $v->errors();
Please login to merge, or discard this patch.
app/Http/Controllers/HomeController.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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;
Please login to merge, or discard this patch.
app/Http/Kernel.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -17,9 +17,9 @@  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
-              // \Torann\Currency\Middleware\CurrencyMiddleware::class,
20
+            \Illuminate\Session\Middleware\StartSession::class,
21
+                \Illuminate\View\Middleware\ShareErrorsFromSession::class,
22
+                // \Torann\Currency\Middleware\CurrencyMiddleware::class,
23 23
         // \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
24 24
     ];
25 25
 
@@ -30,21 +30,21 @@  discard block
 block discarded – undo
30 30
      */
31 31
     protected $middlewareGroups = [
32 32
         'web' => [
33
-             \App\Http\Middleware\Install::class,
33
+                \App\Http\Middleware\Install::class,
34 34
             \App\Http\Middleware\EncryptCookies::class,
35 35
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
36 36
             // \Illuminate\Session\Middleware\StartSession::class,
37 37
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
38 38
             // \Illuminate\View\Middleware\ShareErrorsFromSession::class,
39
-           // \App\Http\Middleware\VerifyCsrfToken::class,
39
+            // \App\Http\Middleware\VerifyCsrfToken::class,
40 40
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
41 41
             \Barryvdh\Cors\HandleCors::class,
42
-             // \App\Http\Middleware\IsInstalled::class,
42
+                // \App\Http\Middleware\IsInstalled::class,
43 43
 
44 44
         ],
45
-         'admin'        => [\App\Http\Middleware\Admin::class],
46
-          'guest'       => [\App\Http\Middleware\RedirectIfAuthenticated::class],
47
-           'auth'       => [\Illuminate\Auth\Middleware\Authenticate::class],
45
+            'admin'        => [\App\Http\Middleware\Admin::class],
46
+            'guest'       => [\App\Http\Middleware\RedirectIfAuthenticated::class],
47
+            'auth'       => [\Illuminate\Auth\Middleware\Authenticate::class],
48 48
         'auth.basic'    => [\Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class],
49 49
 
50 50
         'api' => [
Please login to merge, or discard this patch.