|
@@ -21,6 +21,7 @@ use App\Models\Pro;
|
|
use App\Models\Product;
|
|
use App\Models\Product;
|
|
use App\Models\ProProAccess;
|
|
use App\Models\ProProAccess;
|
|
use App\Models\ProTeam;
|
|
use App\Models\ProTeam;
|
|
|
|
+use App\Models\ProTransaction;
|
|
use App\Models\SectionTemplate;
|
|
use App\Models\SectionTemplate;
|
|
use App\Models\Shipment;
|
|
use App\Models\Shipment;
|
|
use App\Models\SupplyOrder;
|
|
use App\Models\SupplyOrder;
|
|
@@ -113,7 +114,10 @@ class DnaController extends Controller
|
|
|
|
|
|
public function financialTransactions(Request $request){
|
|
public function financialTransactions(Request $request){
|
|
$filters = $request->all();
|
|
$filters = $request->all();
|
|
- $financialTransactions = Bill::paginate(20);
|
|
|
|
|
|
+ $financialTransactions = ProTransaction::select('pro_transaction.*')
|
|
|
|
+ ->join('bill', 'bill.id', '=', 'pro_transaction.bill_id')
|
|
|
|
+ ->where('bill.na_pro_id', $this->performer->pro->id);
|
|
|
|
+ $financialTransactions = $financialTransactions->orderBy('created_at', 'DESC')->paginate(20);
|
|
return view('app.dna.financial-transactions', compact('financialTransactions', 'filters'));
|
|
return view('app.dna.financial-transactions', compact('financialTransactions', 'filters'));
|
|
}
|
|
}
|
|
public function myBills(Request $request){
|
|
public function myBills(Request $request){
|