KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict yang second

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-06-20 15:38:15 +08:00
parent 12408dbdd1 c620d015d9
commit c19ccd1f31
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CustomerController.php
+1 -1
View File
@@ -300,7 +300,7 @@ class CustomerController extends Controller
// $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); // $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai = Customer::on('mysql7') $gadai = Customer::on('mysql7')
->where('tarikhdaftar','=',$tarikh) ->where([['tarikhdaftar','=',$tarikh],['kodcaw',$kodcaw]])
->orderBy('tarikhdaftar', 'desc') ->orderBy('tarikhdaftar', 'desc')
->get(); ->get();
app/Http/Controllers/LaporanController.php
+4 -3
View File
@@ -59,7 +59,7 @@ class LaporanController extends Controller
$bilangan_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->count(); $bilangan_gadai = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$request->tarikh)->count();
$bilangan_tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->count(); $bilangan_tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$request->tarikh)->count();
$bilangan_ansuran = Transaction::on('mysql7')->whereRaw('DATE(created_at) = ?',[$request->tarikh])->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]])->count(); $bilangan_ansuran = Transaction::on('mysql7')->whereRaw('DATE(created_at) = ?',[$request->tarikh])->where([['trans_type','=','A'],['kodcaw','=',$request->kodcaw]])->count();
$bilangan_customer_baru = Customer::on('mysql7')->where('tarikhdaftar','=',$request->tarikh)->count(); $bilangan_customer_baru = Customer::on('mysql7')->where([['tarikhdaftar','=',$request->tarikh],['kodcaw',$request->kodcaw]])->count();
//c //c
/* Sistem */ /* Sistem */
@@ -360,6 +360,7 @@ class LaporanController extends Controller
public function CalcXtra($kodcaw,Request $request) public function CalcXtra($kodcaw,Request $request)
{ {
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$upahsimpan = GlCode::on($cawangan['mysql']) $upahsimpan = GlCode::on($cawangan['mysql'])
@@ -375,8 +376,8 @@ class LaporanController extends Controller
->sum('amaun'); ->sum('amaun');
$kerugianlelongxtra = GlCode::on($cawangan['mysql']) $kerugianlelongxtra = GlCode::on($cawangan['mysql'])
->where('glcode','=','3000/120') ->where('glcode','=','3000/120')
->sum('amaun'); ->sum('amaun');
$arrayxtra = ['upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul), 'kerugianlelong' => floatval($kerugianlelongxtra)]; $arrayxtra = ['upahsimpan' => floatval($upahsimpan), 'bakilelong' => floatval($bakilelongxtra), 'untungrugiterkumpul' => floatval($untungrugiterkumpul), 'kerugianlelong' => floatval($kerugianlelongxtra)];
app/Http/Controllers/TebusController.php
+3 -5
View File
@@ -1000,10 +1000,9 @@ class TebusController extends Controller
->whereNotNull('db2.hargajualan') ->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet'); ->sum('keuntungan_rebet');
$bukanansuran = TransaksiKeuntungan::on('mysql7') $bukanansuran = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->join('transaction as trans', function($join) ->leftJoin('transaction as trans', function($join)
{ {
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
@@ -1017,7 +1016,7 @@ class TebusController extends Controller
$ansuran = TransaksiKeuntungan::on('mysql7') $ansuran = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->join('transaction as trans', function($join) ->leftJoin('transaction as trans', function($join)
{ {
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
@@ -1029,8 +1028,7 @@ class TebusController extends Controller
->whereNotNull('db2.hargajualan') ->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan'); ->sum('bayaran_keuntungan');
$total = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran);
$total = $bukanansuran + $ansuran + $keuntungan;
return response($total); return response($total);
} }