ladybirdweb / agorainvoicing

app/Http/Controllers/Api/ApiController.php

Unused Use Statements -2 removed lines

@@ -3,8 +3,6 @@
 namespace App\Http\Controllers\Api;
 
 use Illuminate\Http\Request;
-
-use App\Http\Requests;
 use App\Http\Controllers\Controller;
 use Exception;
 use App\Model\Order\Order;

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
             $orders = new Order();
             $order = $orders->where('domain',$domain)->first();
             if($order){
-               $result = "success"; 
+                $result = "success"; 
             }
             return response()->json(compact('result'));
         } catch (Exception $ex) {

Spacing +5 added lines, -5 removed lines

@@ -11,17 +11,17 @@
 
 class ApiController extends Controller
 {
-    public function checkDomain(Request $request){
-        try{
+    public function checkDomain(Request $request) {
+        try {
             $result = "fails";
             $domain = $request->input('url');
 
             if (ends_with($domain, '/')) {
-                $domain = substr_replace($domain,"", -1, 1);
+                $domain = substr_replace($domain, "", -1, 1);
             }
             $orders = new Order();
-            $order = $orders->where('domain',$domain)->first();
-            if($order){
+            $order = $orders->where('domain', $domain)->first();
+            if ($order) {
                $result = "success"; 
             }
             return response()->json(compact('result'));

app/Http/Controllers/HomeController.php

Doc Comments +6 added lines

@@ -316,6 +316,9 @@ 
         }
     }
 
+    /**
+     * @param string $result
+     */
     public function submit($result, $url) {
         echo "<form action=$url method=post name=redirect>";
         echo '<input type=hidden name=_token value=csrf_token()/>';
@@ -390,6 +393,9 @@ 
         }
     }
 
+    /**
+     * @param string $data
+     */
     public static function encryptByPublicKey($data) {
         $path = storage_path() . DIRECTORY_SEPARATOR . 'app' . DIRECTORY_SEPARATOR . 'public.key';
         //dd($path);

Spacing +6 added lines, -6 removed lines

@@ -57,7 +57,7 @@ 
         }
 
         echo "<form action=$url method=post name=redirect >";
-        echo '<input type=hidden name=_token value=' . csrf_token() . '>';
+        echo '<input type=hidden name=_token value='.csrf_token().'>';
         echo "<input type=hidden name=value value=$version />";
         echo '</form>';
         echo"<script language='javascript'>document.redirect.submit();</script>";
@@ -128,7 +128,7 @@ 
         try {
             //$encrypted = p¥Ùn¿olÓ¥9)OÞݸÔvh§=Ìtt1rkC‰É§%YœfÐS\BâkHW€mùÌØg¹+VŠ¥²?áÙ{/<¶¡£e¡ˆr°(V)Öíàr„Ž]K9¤ÿÖ¡Åmž”üÈoò״µºŽ06¼e€rœ['4çhH¾ö:¨œ–S„œ¦,|¤ÇqÂrÈŸd+ml‡ uötφûóŽ&›áyÙ(ÆŒÁ$‘¥±Zj*îàÒöL‘ˆD†aɐö_§趰·V„Þú]%ÅR*B=žéršæñ*i+፭±èç|c¹Ñߟ­F$;
             // Get the private Key
-            $path = storage_path('app' . DIRECTORY_SEPARATOR . 'private.key');
+            $path = storage_path('app'.DIRECTORY_SEPARATOR.'private.key');
             $key_content = file_get_contents($path);
             if (!$privateKey = openssl_pkey_get_private($key_content)) {
                 die('Private Key failed');
@@ -153,7 +153,7 @@ 
             // Uncompress the unencrypted data.
             $output = gzuncompress($output);
             dd($output);
-            echo '<br /><br /> Unencrypted Data: ' . $output;
+            echo '<br /><br /> Unencrypted Data: '.$output;
         } catch (Exception $ex) {
             dd($ex);
         }
@@ -165,7 +165,7 @@ 
         $envelope = $encrypted->envelope;
         $input = base64_decode($sealed_data);
         $einput = base64_decode($envelope);
-        $path = storage_path('app' . DIRECTORY_SEPARATOR . 'private.key');
+        $path = storage_path('app'.DIRECTORY_SEPARATOR.'private.key');
         $key_content = file_get_contents($path);
         $private_key = openssl_get_privatekey($key_content);
         $plaintext = NULL;
@@ -319,7 +319,7 @@ 
     public function submit($result, $url) {
         echo "<form action=$url method=post name=redirect>";
         echo '<input type=hidden name=_token value=csrf_token()/>';
-        echo "<input type=hidden name=result value=" . $result . "/>";
+        echo "<input type=hidden name=result value=".$result."/>";
         echo '</form>';
         echo"<script language='javascript'>document.redirect.submit();</script>";
     }
@@ -391,7 +391,7 @@ 
     }
 
     public static function encryptByPublicKey($data) {
-        $path = storage_path() . DIRECTORY_SEPARATOR . 'app' . DIRECTORY_SEPARATOR . 'public.key';
+        $path = storage_path().DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'public.key';
         //dd($path);
         $key_content = file_get_contents($path);
         $public_key = openssl_get_publickey($key_content);

app/Http/Controllers/Order/OrderController.php

Doc Comments +1 added lines, -7 removed lines

@@ -749,10 +749,4 @@
     }
     
     public function renew($orderid){
-        //$sub = $this->subscription($orderid);
-        return url('my-orders');
-    }
-
-=======
->>>>>>> origin/master
-}
+        //$sub = $this->subscription($orderid
\ No newline at end of file

Unused Use Statements +1 added lines, -7 removed lines

@@ -749,10 +749,4 @@
     }
     
     public function renew($orderid){
-        //$sub = $this->subscription($orderid);
-        return url('my-orders');
-    }
-
-=======
->>>>>>> origin/master
-}
+        //$sub = $this->subscription($orderid
\ No newline at end of file

Indentation +1 added lines, -7 removed lines

@@ -749,10 +749,4 @@
     }
     
     public function renew($orderid){
-        //$sub = $this->subscription($orderid);
-        return url('my-orders');
-    }
-
-=======
->>>>>>> origin/master
-}
+        //$sub = $this->subscription($orderid
\ No newline at end of file

Switch Indentation +1 added lines, -7 removed lines

@@ -749,10 +749,4 @@
     }
     
     public function renew($orderid){
-        //$sub = $this->subscription($orderid);
-        return url('my-orders');
-    }
-
-=======
->>>>>>> origin/master
-}
+        //$sub = $this->subscription($orderid
\ No newline at end of file

Spacing +7 added lines, -13 removed lines

@@ -105,11 +105,11 @@ 
         //return \Datatable::query($this->order->select('id', 'created_at', 'client',
         //'price_override', 'order_status', 'number', 'serial_key'))
         return \Datatable::Collection($query->get())
-                        ->addColumn('#', function ($model) {
+                        ->addColumn('#', function($model) {
                             return "<input type='checkbox' value=".$model->id.' name=select[] id=check>';
                         })
                         ->showColumns('created_at')
-                        ->addColumn('client', function ($model) {
+                        ->addColumn('client', function($model) {
                             $user = $this->user->where('id', $model->client)->first();
                             $first = $user->first_name;
                             $last = $user->last_name;
@@ -118,7 +118,7 @@ 
                             return '<a href='.url('clients/'.$id).'>'.ucfirst($first).' '.ucfirst($last).'<a>';
                         })
                         ->showColumns('number', 'price_override', 'order_status')
-                        ->addColumn('ends_at', function ($model) {
+                        ->addColumn('ends_at', function($model) {
                             $end = '--';
                             $ends = $model->subscription()->first();
                             if ($ends) {
@@ -131,7 +131,7 @@ 
 
                             return $end;
                         })
-                        ->addColumn('action', function ($model) {
+                        ->addColumn('action', function($model) {
                             $sub = $model->subscription()->first();
                             $status = $this->checkInvoiceStatusByOrderId($model->id);
                             $url = '';
@@ -683,7 +683,7 @@ 
         $subject = $template->name;
         $data = $template->data;
         $replace = [
-            'name' => $user->first_name . ' ' . $user->last_name, 
+            'name' => $user->first_name.' '.$user->last_name, 
             'downloadurl' => $downloadurl, 
             'invoiceurl' => $invoiceurl,
             'product'=>$product,
@@ -733,7 +733,7 @@ 
 
         return $product;
     }
-<<<<<<< HEAD
+<< << <<< HEAD
     
     public function subscription($orderid){
         $sub = $this->subscription->where('order_id',$orderid)->first();
@@ -749,10 +749,4 @@ 
     }
     
     public function renew($orderid){
-        //$sub = $this->subscription($orderid);
-        return url('my-orders');
-    }
-
-=======
->>>>>>> origin/master
-}
+        //$sub = $this->subscription($orderid
\ No newline at end of file

Braces +1 added lines, -7 removed lines

@@ -749,10 +749,4 @@
     }
     
     public function renew($orderid){
-        //$sub = $this->subscription($orderid);
-        return url('my-orders');
-    }
-
-=======
->>>>>>> origin/master
-}
+        //$sub = $this->subscription($orderid
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -7 removed lines

@@ -749,10 +749,4 @@
     }
     
     public function renew($orderid){
-        //$sub = $this->subscription($orderid);
-        return url('my-orders');
-    }
-
-=======
->>>>>>> origin/master
-}
+        //$sub = $this->subscription($orderid
\ No newline at end of file

app/Http/Controllers/Github/GithubController.php

Spacing +1 added lines, -1 removed lines

@@ -292,7 +292,7 @@
     {
         try {
             $release = $this->latestRelese($owner, $repo);
-            if(key_exists('tag_name', $release)){
+            if (key_exists('tag_name', $release)) {
                 return $release['tag_name'];
             }
             return NULL;

app/Http/Controllers/Common/CronController.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
         $sub = $this->sub
                 ->where('ends_at', '!=', '0000-00-00 00:00:00')
                 ->whereNotNull('ends_at')
-                ->whereBetween('ends_at', [$plus29days,$plus31days]);
+                ->whereBetween('ends_at', [$plus29days, $plus31days]);
         //dd($sub->get());
 
         return $sub;
@@ -458,7 +458,7 @@ 
         $templates = new \App\Model\Common\Template();
         $temp_id = $setting->subscription_going_to_end;
         //dd($setting);
-        if($end<date('Y-m-d H:m:i')){
+        if ($end < date('Y-m-d H:m:i')) {
             $temp_id = $setting->subscription_over;
         }
         //dd($temp_id);

app/Http/routes.php

Spacing +2 added lines, -2 removed lines

@@ -356,12 +356,12 @@
  * Api
  */
 
-Route::group(['prefix'=>'api'],function(){
+Route::group(['prefix'=>'api'], function() {
     /**
      * Unautherised requests
      */
     
-    Route::get('check-url','Api\ApiController@checkDomain');
+    Route::get('check-url', 'Api\ApiController@checkDomain');
     
 });
 

app/Model/Product/Product.php

Indentation +2 added lines, -2 removed lines

@@ -67,8 +67,8 @@
     }
     
     public function plan(){
-      $plan  = $this->planRelation()->first();
-      return $plan; 
+        $plan  = $this->planRelation()->first();
+        return $plan; 
     }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -10,7 +10,7 @@ 
     protected $fillable = ['name', 'description', 'type', 'group', 'file', 'image', 'require_domain', 'category',
         'stock_control', 'stock_qty', 'sort_order', 'tax_apply', 'retired', 'hidden', 'multiple_qty', 'auto_terminate',
         'setup_order_placed', 'setup_first_payment', 'setup_accept_manually', 'no_auto_setup', 'shoping_cart_link', 'process_url', 'github_owner', 'github_repository',
-        'deny_after_subscription', 'version', 'parent', 'subscription',];
+        'deny_after_subscription', 'version', 'parent', 'subscription', ];
 
     public function order() {
         return $this->hasMany('App\Model\Order\Order');
@@ -63,11 +63,11 @@ 
 
     public function planRelation() {
         $related = "App\Model\Payment\Plan";
-        return $this->hasMany($related,'product');
+        return $this->hasMany($related, 'product');
     }
     
-    public function plan(){
-      $plan  = $this->planRelation()->first();
+    public function plan() {
+      $plan = $this->planRelation()->first();
       return $plan; 
     }