View GitHub Repository agorainvoicing

Schedule Inspection
Subscribe
Completed
Push — development ( feed60...37556e )
by Ashutosh
12:34
created
Status
Category
Toggle Patches
app/Http/Controllers/User/AdminOrderInvoiceController.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch 
@@ -14,11 +14,11 @@  discard block
 
 block discarded – undo
14 14 
         $invoices = $invoice->where('user_id', $id)->orderBy('created_at', 'desc')->get();
15 15
16 16 
         return\ DataTables::of($invoices)
17 
-                        ->addColumn('checkbox', function ($model) {
17 
+                        ->addColumn('checkbox', function($model) {
18 18 
                             return "<input type='checkbox' class='invoice_checkbox'
19 19 
                             value=".$model->id.' name=select[] id=check>';
20 20 
                         })
21 
-                        ->addColumn('date', function ($model) use ($client) {
21 
+                        ->addColumn('date', function($model) use ($client) {
22 22 
                             $date1 = new \DateTime($model->date);
23 23 
                             $tz = \Auth::user()->timezone()->first()->name;
24 24 
                             $date1->setTimezone(new \DateTimeZone($tz));
 
@@ -26,13 +26,13 @@  discard block
 
 block discarded – undo
26 26
27 27 
                             return $date;
28 28 
                         })
29 
-                        ->addColumn('invoice_no', function ($model) {
29 
+                        ->addColumn('invoice_no', function($model) {
30 30 
                             return      '<a href='.url('invoices/show?invoiceid='.$model->id).'>'.$model->number.'</a>';
31 31 
                         })
32 
-                        ->addColumn('total', function ($model) use ($client) {
32 
+                        ->addColumn('total', function($model) use ($client) {
33 33 
                             return currency_format($model->grand_total, $code = $client->currency);
34 34 
                         })
35 
-                         ->addColumn('paid', function ($model) use ($client) {
35 
+                         ->addColumn('paid', function($model) use ($client) {
36 36 
                              $payment = \App\Model\Order\Payment::where('invoice_id', $model->id)->select('amount')->get();
37 37 
                              $c = count($payment);
38 38 
                              $sum = 0;
 
@@ -43,7 +43,7 @@  discard block
 
 block discarded – undo
43 43
44 44 
                              return currency_format($sum, $code = $client->currency);
45 45 
                          })
46 
-                         ->addColumn('balance', function ($model) use ($client) {
46 
+                         ->addColumn('balance', function($model) use ($client) {
47 47 
                              $payment = \App\Model\Order\Payment::where('invoice_id', $model->id)->select('amount')->get();
48 48 
                              $c = count($payment);
49 49 
                              $sum = 0;
 
@@ -55,10 +55,10 @@  discard block
 
 block discarded – undo
55 55
56 56 
                              return currency_format($pendingAmount, $code = $client->currency);
57 57 
                          })
58 
-                          ->addColumn('status', function ($model) {
58 
+                          ->addColumn('status', function($model) {
59 59 
                               return $model->status;
60 60 
                           })
61 
-                        ->addColumn('action', function ($model) {
61 
+                        ->addColumn('action', function($model) {
62 62 
                             $action = '';
63 63 
                             $cont = new \App\Http\Controllers\Order\TaxRatesAndCodeExpiryController();
64 64 
                             $check = $cont->checkExecution($model->id);
 
@@ -88,35 +88,35 @@  discard block
 
 block discarded – undo
88 88 
         $order = $client->order()->orderBy('created_at', 'desc')->get();
89 89
90 90 
         return\ DataTables::of($order)
91 
-                        ->addColumn('checkbox', function ($model) {
91 
+                        ->addColumn('checkbox', function($model) {
92 92 
                             return "<input type='checkbox' class='order_checkbox'
93 93 
                             value=".$model->id.' name=select[] id=checkorder>';
94 94 
                         })
95 
-                        ->addColumn('date', function ($model) {
95 
+                        ->addColumn('date', function($model) {
96 96 
                             return ucfirst($model->created_at);
97 97 
                         })
98 
-                        ->addColumn('product', function ($model) {
98 
+                        ->addColumn('product', function($model) {
99 99 
                             $productName = $model->product()->first() && $model->product()->first()->name ?
100 100 
                             $model->product()->first()->name : 'Unknown';
101 101
102 102 
                             return $productName;
103 103 
                         })
104 
-                        ->addColumn('number', function ($model) {
104 
+                        ->addColumn('number', function($model) {
105 105 
                             $number = $model->number;
106 106
107 107 
                             return $number;
108 108 
                         })
109 
-                         ->addColumn('total', function ($model) use ($client) {
109 
+                         ->addColumn('total', function($model) use ($client) {
110 110 
                              $price = currency_format($model->price_override, $code = $client->currency);
111 111
112 112 
                              return $price;
113 113 
                          })
114 
-                         ->addColumn('status', function ($model) {
114 
+                         ->addColumn('status', function($model) {
115 115 
                              $status = $model->order_status;
116 116
117 117 
                              return $status;
118 118 
                          })
119 
-                        ->addColumn('action', function ($model) {
119 
+                        ->addColumn('action', function($model) {
120 120 
                             return '<a href='.url('orders/'.$model->id)."
121 121 
                             class='btn btn-sm btn-primary btn-xs'><i class='fa fa-eye'
122 122 
                             style='color:white;'> </i>&nbsp;&nbsp;View</a>";
 
@@ -133,25 +133,25 @@  discard block
 
 block discarded – undo
133 133 
         $extraAmt = $this->getExtraAmtPaid($id);
134 134
135 135 
         return\ DataTables::of($payments)
136 
-                        ->addColumn('checkbox', function ($model) {
136 
+                        ->addColumn('checkbox', function($model) {
137 137 
                             return "<input type='checkbox' class='payment_checkbox'
138 138 
                             value=".$model->id.' name=select[] id=checkpayment>';
139 139 
                         })
140 
-                        ->addColumn('invoice_no', function ($model) {
140 
+                        ->addColumn('invoice_no', function($model) {
141 141 
                             return $model->invoice()->first() ? $model->invoice()->first()->number : '--';
142 142 
                         })
143 
-                        ->addColumn('date', function ($model) {
143 
+                        ->addColumn('date', function($model) {
144 144 
                             $date = $model->created_at;
145 145 
                             $date1 = new \DateTime($date);
146 146 
                             $date = $date1->format('M j, Y, g:i a ');
147 147
148 148 
                             return $date;
149 149 
                         })
150 
-                        ->addColumn('payment_method', function ($model) {
150 
+                        ->addColumn('payment_method', function($model) {
151 151 
                             return $model->payment_method;
152 152 
                         })
153 153
154 
-                         ->addColumn('total', function ($model) use ($client, $extraAmt) {
154 
+                         ->addColumn('total', function($model) use ($client, $extraAmt) {
155 155 
                              if ($model->invoice_id == 0) {
156 156 
                                  $amount = currency_format($extraAmt, $code = $client->currency);
157 157 
                              } else {
 
@@ -160,11 +160,11 @@  discard block
 
 block discarded – undo
160 160
161 161 
                              return $amount;
162 162 
                          })
163 
-                         ->addColumn('status', function ($model) {
163 
+                         ->addColumn('status', function($model) {
164 164 
                              return ucfirst($model->payment_status);
165 165 
                          })
166 166
167 
-                         ->addColumn('action', function ($model) {
167 
+                         ->addColumn('action', function($model) {
168 168 
                              '<input type="hidden" class="paymentid" value="{{$model->id}}">';
169 169 
                              if ($model->invoice_id == 0) {
170 170 
                                  return '<a href='.url('payments/'.$model->id.'/edit/')." class='btn btn-sm btn-primary btn-xs'> <i class='fa fa-edit' style='color:white;'> </i>&nbsp;&nbsp;Edit</a>";
Please login to merge, or discard this patch.
app/Http/Controllers/Product/ExtendedBaseProductController.php 1 patch
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>"./* @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='domain.com or sub.domain.com'>
125 125 
                 </div>";
Please login to merge, or discard this patch.
app/Http/Controllers/Order/ExtendedBaseInvoiceController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -36,7 +36,7 @@  discard block
 
 block discarded – undo
36 36 
             $symbol = Currency::where('code', $currency)->pluck('symbol')->first();
37 37 
             $orders = $order->where('client', $clientid)->get();
38 38
39 
-            return view('themes.default1.invoice.newpayment', compact('clientid', 'client', 'invoices',  'orders',
39 
+            return view('themes.default1.invoice.newpayment', compact('clientid', 'client', 'invoices', 'orders',
40 40 
                   'invoiceSum', 'amountReceived', 'pendingAmount', 'currency', 'symbol'));
41 41 
         } catch (Exception $ex) {
42 42 
             return redirect()->back()->with('fails', $ex->getMessage());
 
@@ -74,7 +74,7 @@  discard block
 
 block discarded – undo
74 74 
             $totalSum = array_sum($payment);
75 75 
         }
76 76
77 
-        return view('themes.default1.invoice.editInvoice', compact('userid','date','invoiceid', 'invoice', 'totalSum'));
77 
+        return view('themes.default1.invoice.editInvoice', compact('userid', 'date', 'invoiceid', 'invoice', 'totalSum'));
78 78 
     }
79 79
80 80 
     public function postEdit($invoiceid, Request $request)
 
@@ -115,7 +115,7 @@  discard block
 
 block discarded – undo
115 115 
             $invoicAmount = $request->invoiceAmount;
116 116 
             $amtToCredit = $request->amtToCredit;
117 117 
             $payment_status = 'success';
118 
-            $payment = $this->multiplePayment($clientid,$invoiceChecked, $payment_method,
118 
+            $payment = $this->multiplePayment($clientid, $invoiceChecked, $payment_method,
119 119 
              $payment_date, $totalAmt, $invoicAmount, $amtToCredit, $payment_status);
120 120 
             $response = ['type' => 'success', 'message' => 'Payment Updated Successfully'];
121 121 
 
@@ -132,7 +132,7 @@  discard block
 
 block discarded – undo
132 132 
         }
133 133 
     }
134 134
135 
-    public function multiplePayment($clientid,$invoiceChecked, $payment_method,
135 
+    public function multiplePayment($clientid, $invoiceChecked, $payment_method,
136 136 
              $payment_date, $totalAmt, $invoicAmount, $amtToCredit, $payment_status)
137 137 
     {
138 138 
         try {
 
@@ -213,7 +213,7 @@  discard block
 
 block discarded – undo
213 213 
             $invoicAmount = $request->invoiceAmount;
214 214 
             $amtToCredit = $request->amtToCredit;
215 215 
             $payment_status = 'success';
216 
-            $payment = $this->updatePaymentByInvoice($clientid,$invoiceChecked, $payment_method,
216 
+            $payment = $this->updatePaymentByInvoice($clientid, $invoiceChecked, $payment_method,
217 217 
              $payment_date, $totalAmt, $invoicAmount, $amtToCredit, $payment_status);
218 218 
             $response = ['type' => 'success', 'message' => 'Payment Updated Successfully'];
219 219 
 
@@ -227,7 +227,7 @@  discard block
 
 block discarded – undo
227 227 
         }
228 228 
     }
229 229
230 
-    public function updatePaymentByInvoice($clientid,$invoiceChecked, $payment_method,
230 
+    public function updatePaymentByInvoice($clientid, $invoiceChecked, $payment_method,
231 231 
              $payment_date, $totalAmt, $invoicAmount, $amtToCredit, $payment_status)
232 232 
     {
233 233 
         try {
Please login to merge, or discard this patch.