fix merge

2021-09-06 11:01:49 +08:00
parent b0251cb4a1
commit dd7c01f77a
4 changed files with 11 additions and 14 deletions
@@ -400,16 +400,6 @@ class VaultController extends Controller
   {
      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();

-      // $pendahuluan = Vault::on($cawangan['mysql'])
-      // ->where('kodcaw','=',$kodcaw)
-      // ->where('tarikh','<=', $request->tarikh)
-      // ->sum('pendahuluan');
-
-      // $serahan = Vault::on($cawangan['mysql'])
-      // ->where('kodcaw','=',$kodcaw)
-      // ->where('tarikh','<=', $request->tarikh)
-      // ->sum('serahan');
-
      $serahanpkb = '1000/020';
      $serahanjmc = '1000/026';
      $pendahuluanpkb = '7000/102';