Merge branch 'apiaku' into 'master'
fix skit2 See merge request online-sistem1/api_arrahn!98
This commit is contained in:
@@ -2187,8 +2187,8 @@ class GadaiController extends Controller
|
|||||||
case '1STOP':
|
case '1STOP':
|
||||||
$tarikhtawarruq = '2021-05-09';
|
$tarikhtawarruq = '2021-05-09';
|
||||||
break;
|
break;
|
||||||
case '020301';
|
case '020301';
|
||||||
$tarikhtawarruq = '2021-05-19';
|
$tarikhtawarruq = '2021-05-18';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ use App\Advansur;
|
|||||||
use App\Vault;
|
use App\Vault;
|
||||||
use App\Tunai;
|
use App\Tunai;
|
||||||
use App\Denominasi;
|
use App\Denominasi;
|
||||||
use App\Hapuskira;
|
use App\HapusKira;
|
||||||
|
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
|
|
||||||
|
|||||||
@@ -396,7 +396,6 @@ class VaultController extends Controller
|
|||||||
|
|
||||||
$pindahkekpkb = GlCode::on($cawangan['mysql'])
|
$pindahkekpkb = GlCode::on($cawangan['mysql'])
|
||||||
->where('glcode','=',$serahankoperasi)
|
->where('glcode','=',$serahankoperasi)
|
||||||
->orWhere('glcode','=',)
|
|
||||||
->sum('amaun');
|
->sum('amaun');
|
||||||
|
|
||||||
$arraypend = ['pendahuluan' => $total,'serahan' => $totalserahan,'pindahkekpkb' => $pindahkekpkb];
|
$arraypend = ['pendahuluan' => $total,'serahan' => $totalserahan,'pindahkekpkb' => $pindahkekpkb];
|
||||||
|
|||||||
Reference in New Issue
Block a user