Merge branch 'hafiza-ali'
This commit is contained in:
@@ -0,0 +1,29 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App;
|
||||||
|
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
|
class BankMaster extends Model
|
||||||
|
{
|
||||||
|
protected $connection = 'mysql7';
|
||||||
|
protected $table = 'bank';
|
||||||
|
protected $primaryKey = 'BANKCODE';
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The attributes that are mass assignable.
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
// protected $fillable = [
|
||||||
|
|
||||||
|
// ];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The attributes excluded from the model's JSON form.
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
// protected $hidden = [];
|
||||||
|
}
|
||||||
@@ -3,9 +3,11 @@
|
|||||||
namespace App;
|
namespace App;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
|
|
||||||
class Customer extends Model
|
class Customer extends Model
|
||||||
{
|
{
|
||||||
|
|
||||||
protected $table = 'customer';
|
protected $table = 'customer';
|
||||||
public $timestamps = false;
|
public $timestamps = false;
|
||||||
/**
|
/**
|
||||||
@@ -13,6 +15,8 @@ class Customer extends Model
|
|||||||
*
|
*
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
|
protected $primaryKey = ['kplama','kpbaru'];
|
||||||
|
public $incrementing = false;
|
||||||
protected $fillable = [
|
protected $fillable = [
|
||||||
'ahli',
|
'ahli',
|
||||||
'kodcaw',
|
'kodcaw',
|
||||||
@@ -65,4 +69,43 @@ class Customer extends Model
|
|||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
// protected $hidden = [];
|
// protected $hidden = [];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the keys for a save update query.
|
||||||
|
*
|
||||||
|
* @param \Illuminate\Database\Eloquent\Builder $query
|
||||||
|
* @return \Illuminate\Database\Eloquent\Builder
|
||||||
|
*/
|
||||||
|
protected function setKeysForSaveQuery(Builder $query)
|
||||||
|
{
|
||||||
|
$keys = $this->getKeyName();
|
||||||
|
if(!is_array($keys)){
|
||||||
|
return parent::setKeysForSaveQuery($query);
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach($keys as $keyName){
|
||||||
|
$query->where($keyName, '=', $this->getKeyForSaveQuery($keyName));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $query;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the primary key value for a save query.
|
||||||
|
*
|
||||||
|
* @param mixed $keyName
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
protected function getKeyForSaveQuery($keyName = null)
|
||||||
|
{
|
||||||
|
if(is_null($keyName)){
|
||||||
|
$keyName = $this->getKeyName();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($this->original[$keyName])) {
|
||||||
|
return $this->original[$keyName];
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->getAttribute($keyName);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+1
-1
@@ -4,7 +4,7 @@ namespace App;
|
|||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
class AnsRugi extends Model
|
class GlDetail extends Model
|
||||||
{
|
{
|
||||||
protected $table = 'gldetail';
|
protected $table = 'gldetail';
|
||||||
public $timestamps = false;
|
public $timestamps = false;
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Http\Controllers;
|
namespace App\Http\Controllers;
|
||||||
|
|
||||||
|
use App\BankMaster;
|
||||||
use App\Customer;
|
use App\Customer;
|
||||||
use App\Gadai;
|
use App\Gadai;
|
||||||
use App\Lelong;
|
use App\Lelong;
|
||||||
@@ -197,39 +198,62 @@ class CustomerController extends Controller
|
|||||||
return response()->json($gadai_all);
|
return response()->json($gadai_all);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function showOneCustomerGadaiByCawanganMobile($ic,$status,$kodcaw){
|
public function gadaiTebusLelongByCawanganMobile($ic,$kodcaw){
|
||||||
if($status == 'belum_tebus'){
|
|
||||||
$gadai_status = '';
|
|
||||||
}elseif($status == 'sudah_tebus'){
|
|
||||||
$gadai_status = 'T';
|
|
||||||
}elseif($status == 'lelong'){
|
|
||||||
$gadai_status = 'L';
|
|
||||||
}
|
|
||||||
|
|
||||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||||
$gadai_all = [];
|
$sttebus_ = [];
|
||||||
if($status == 'belum_tebus' || $status == 'sudah_tebus'){
|
$sttebus_T = [];
|
||||||
$gadai = Gadai::on($cawangan['mysql'])
|
$sttebus_L = [];
|
||||||
->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
|
$array_all = [];
|
||||||
->get();
|
|
||||||
if(sizeof($gadai) != 0){
|
$gadai = Gadai::on($cawangan['mysql'])->where([['nokp','=',$ic]])->get();
|
||||||
foreach($gadai as $index => $gadai_detail){
|
|
||||||
array_push($gadai_all,['norujukan'=>$gadai_detail['norujukan'],'hargajualan'=>$gadai_detail['hargajualan'],'bakihargajualan'=>$gadai_detail['bakihargajualan']]);
|
//to check if gadai has data
|
||||||
|
if(!empty($gadai))
|
||||||
|
{
|
||||||
|
//loop each array
|
||||||
|
foreach($gadai as $gd){
|
||||||
|
|
||||||
|
if($gd->sttebus == '' || empty($gd->sttebus)){
|
||||||
|
|
||||||
|
array_push($sttebus_, array(
|
||||||
|
'norujukan' => $gd->norujukan,
|
||||||
|
'hargajualan' => $gd->hargajualan,
|
||||||
|
'bakihargajualan' => $gd->bakihargajualan,
|
||||||
|
));
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
elseif($gd->sttebus == 'T')
|
||||||
}elseif($status == 'lelong'){
|
{
|
||||||
$gadai = Gadai::on($cawangan['mysql'])
|
array_push($sttebus_T, array(
|
||||||
->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
|
'norujukan' => $gd->norujukan,
|
||||||
->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
|
'hargajualan' => $gd->hargajualan,
|
||||||
->get();
|
'bakihargajualan' => $gd->bakihargajualan,
|
||||||
if(sizeof($gadai) != 0){
|
));
|
||||||
foreach($gadai as $index => $gadai_detail){
|
|
||||||
array_push($gadai_all,['norujukan'=>$gadai_detail['norujukan'],'hargajualan'=>$gadai_detail['hargajualan'],'bakihargajualan'=>$gadai_detail['bakihargajualan']]);
|
}
|
||||||
|
elseif($gd->sttebus == 'L')
|
||||||
|
{
|
||||||
|
array_push($sttebus_L, array(
|
||||||
|
'norujukan' => $gd->norujukan,
|
||||||
|
'hargajualan' => $gd->hargajualan,
|
||||||
|
'bakihargajualan' => $gd->bakihargajualan,
|
||||||
|
));
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return response()->json('Data Not Found');
|
||||||
|
}
|
||||||
|
|
||||||
return response()->json($gadai_all);
|
array_push($array_all, array(
|
||||||
|
'gadai' => $sttebus_,
|
||||||
|
'tebus' => $sttebus_T,
|
||||||
|
'lelong' => $sttebus_L
|
||||||
|
));
|
||||||
|
return response()->json($array_all);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getLaporanCustomers($kodcaw, $tarikh)
|
public function getLaporanCustomers($kodcaw, $tarikh)
|
||||||
@@ -395,4 +419,78 @@ class CustomerController extends Controller
|
|||||||
|
|
||||||
return response('Deleted Successfully', 200);
|
return response('Deleted Successfully', 200);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function akaunBankMobile($nokp)
|
||||||
|
{
|
||||||
|
$array_cust = [];
|
||||||
|
$cawangan_all = Cawangan::on('mysql7')->get();
|
||||||
|
|
||||||
|
foreach($cawangan_all as $cawangan)
|
||||||
|
{
|
||||||
|
$customer = Customer::on($cawangan['mysql'])
|
||||||
|
->where('kplama','=',$nokp)
|
||||||
|
->orWhere('kpbaru','=',$nokp)
|
||||||
|
->rightJoin('online_arrahn.bank', 'bank.id', '=', 'customer.kodbank')
|
||||||
|
->first();
|
||||||
|
|
||||||
|
if(!empty($customer))
|
||||||
|
{
|
||||||
|
$customer_detail['noakaun'] = $customer['noakaun'];
|
||||||
|
$customer_detail['namabank'] = $customer['name'];
|
||||||
|
$customer_detail['kodbank'] = $customer['id'];
|
||||||
|
|
||||||
|
return response()->json($customer_detail);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return $array_cust;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function bankListMobile()
|
||||||
|
{
|
||||||
|
$bank_array = [];
|
||||||
|
$cawangan_all = Cawangan::on('mysql7')->get();
|
||||||
|
foreach($cawangan_all as $cawangan)
|
||||||
|
{
|
||||||
|
$bank = BankMaster::get();
|
||||||
|
if(!empty($bank))
|
||||||
|
{
|
||||||
|
//loop each array
|
||||||
|
foreach($bank as $banklist)
|
||||||
|
{
|
||||||
|
array_push($bank_array, array(
|
||||||
|
'kodbank' => $banklist->id,
|
||||||
|
'namabank' => $banklist->name,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
return response()->json($bank_array);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return response()->json('Data Not Found');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function insertAkaunBankMobile(Request $request)
|
||||||
|
{
|
||||||
|
$cawangan_all = Cawangan::on('mysql7')->get();
|
||||||
|
foreach($cawangan_all as $index=>$cawangan)
|
||||||
|
{
|
||||||
|
$customer = Customer::on($cawangan['mysql'])
|
||||||
|
->where('kplama','=',$request->nokp)
|
||||||
|
->orWhere('kpbaru','=',$request->nokp)
|
||||||
|
->first();
|
||||||
|
|
||||||
|
if(!empty($customer))
|
||||||
|
{
|
||||||
|
$customer->kodbank = $request->kodbank;
|
||||||
|
$customer->noakaun = $request->noakaun;
|
||||||
|
$customer->save();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return response()->json($customer, 200);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1350,7 +1350,7 @@ class GadaiController extends Controller
|
|||||||
$current = Carbon::now();
|
$current = Carbon::now();
|
||||||
$current = new Carbon();
|
$current = new Carbon();
|
||||||
foreach($cawangan_all as $index=>$cawangan){
|
foreach($cawangan_all as $index=>$cawangan){
|
||||||
$gadai = Gadai::on($cawangan['mysql'])->where([['sttebus','=',''],['t_gadai','=','2020-10-05']])->sum('pinjaman');
|
$gadai = Gadai::on($cawangan['mysql'])->where([['sttebus','=',''],['t_gadai','=',$current->toDateString()]])->sum('pinjaman');
|
||||||
array_push($array_cawangan,['cawangan'=>$cawangan['details_caw'],'total_gadai'=>$gadai]);
|
array_push($array_cawangan,['cawangan'=>$cawangan['details_caw'],'total_gadai'=>$gadai]);
|
||||||
$total_gadaian_cawangan += $gadai;
|
$total_gadaian_cawangan += $gadai;
|
||||||
|
|
||||||
@@ -1468,6 +1468,7 @@ class GadaiController extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function statistikGadaian(){
|
public function statistikGadaian(){
|
||||||
|
|
||||||
$current = Carbon::now();
|
$current = Carbon::now();
|
||||||
$current = new Carbon();
|
$current = new Carbon();
|
||||||
|
|
||||||
@@ -1485,4 +1486,32 @@ class GadaiController extends Controller
|
|||||||
|
|
||||||
return response()->json($array_total);
|
return response()->json($array_total);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function carian_AgingBulanan($kodcaw,$tarikh,$num)
|
||||||
|
{
|
||||||
|
|
||||||
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||||
|
$db=$cawangan['mysql'];
|
||||||
|
|
||||||
|
$gadai_aging=DB::connection($db)->select("SELECT count(norujukan) as a,sum(pinjaman)as b From gadai where (((period_diff(date_format('".$tarikh."', '%Y%m'), date_format(t_gadai, '%Y%m')))+1)=".$num.") and((sttebus='' and t_gadai<='".$tarikh."') or (sttebus!='' and t_update>'".$tarikh."'and t_gadai<='".$tarikh."'))");
|
||||||
|
return response()->json($gadai_aging);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function carian_agingLebih12_Bulan($kodcaw,$tarikh)
|
||||||
|
{
|
||||||
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||||
|
$db=$cawangan['mysql'];
|
||||||
|
$gadai_aging=DB::connection($db)->select("SELECT count(norujukan) as a,sum(pinjaman)as b From gadai where (((period_diff(DATE_FORMAT('".$tarikh."', '%Y%m'), date_format(t_gadai, '%Y%m')))+1)>'12') and((sttebus='' and t_gadai<='".$tarikh."') or (sttebus!='' and t_update>'".$tarikh."' and t_gadai<='".$tarikh."'))");
|
||||||
|
return response()->json($gadai_aging);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function carian_Seluruh_AgingBulanan($kodcaw,$tarikh)
|
||||||
|
{
|
||||||
|
|
||||||
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||||
|
$db=$cawangan['mysql'];
|
||||||
|
|
||||||
|
$gadai_aging=DB::connection($db)->select("SELECT kodcaw,count(norujukan) as a,sum(pinjaman)as b,((period_diff(date_format('".$tarikh."', '%Y%m'), date_format(t_gadai, '%Y%m')))+1) AS bln From gadai where ((sttebus='' and t_gadai<='".$tarikh."') or (sttebus!='' and t_update>'".$tarikh."' and t_gadai<='".$tarikh."'))");
|
||||||
|
return response()->json($gadai_aging);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,6 +57,9 @@ class KelulusanController extends Controller
|
|||||||
|
|
||||||
$kelulusan=Mohon::on($cawangan['mysql'])
|
$kelulusan=Mohon::on($cawangan['mysql'])
|
||||||
->where('tarikh','<',$harini->toDateString())
|
->where('tarikh','<',$harini->toDateString())
|
||||||
|
->where('pelulus','=','khazanah')
|
||||||
|
->where('peloperasi','=','')
|
||||||
|
->where('masalulus','<>','')
|
||||||
->get();
|
->get();
|
||||||
|
|
||||||
return response()->json($kelulusan);
|
return response()->json($kelulusan);
|
||||||
|
|||||||
@@ -13,8 +13,10 @@ use Carbon\Carbon;
|
|||||||
class KomuditiController extends Controller
|
class KomuditiController extends Controller
|
||||||
{
|
{
|
||||||
public function checkKomuditi(){
|
public function checkKomuditi(){
|
||||||
|
$current = Carbon::now();
|
||||||
|
$current = new Carbon();
|
||||||
|
|
||||||
$komuditi = KomuditiPurchase::on('mysql7')->orderBy('created_at','desc')->first();
|
$komuditi = KomuditiPurchase::on('mysql7')->where('date_purchase','=',$current->toDateString())->orderBy('created_at','desc')->first();
|
||||||
return response()->json($komuditi);
|
return response()->json($komuditi);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -22,9 +24,9 @@ class KomuditiController extends Controller
|
|||||||
$current = Carbon::now();
|
$current = Carbon::now();
|
||||||
$current = new Carbon();
|
$current = new Carbon();
|
||||||
|
|
||||||
$komuditi = Komuditi::on('mysql7')->select('unit_komuditi')->where('date_purchase','=',$current->toDateString())->first();
|
$komuditi = KomuditiPurchase::on('mysql7')->select('unit_komuditi')->where('date_purchase','=',$current->toDateString())->orderBy('created_at','desc')->first();
|
||||||
$unit_komuditi = $komuditi['unit_komuditi'];
|
|
||||||
return response()->json($unit_komuditi);
|
return response()->json($komuditi['unit_komuditi']);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function beliKomuditi(Request $request){
|
public function beliKomuditi(Request $request){
|
||||||
@@ -71,7 +73,7 @@ class KomuditiController extends Controller
|
|||||||
$current = Carbon::now();
|
$current = Carbon::now();
|
||||||
$current = new Carbon();
|
$current = new Carbon();
|
||||||
|
|
||||||
$komuditi_current = KomuditiPurchase::on('mysql7')->orderBy('created_at','desc')->first();
|
$komuditi_current = KomuditiPurchase::on('mysql7')->where('date_purchase','=',$current->toDateString())->orderBy('created_at','desc')->first();
|
||||||
// dd($komuditi_current);
|
// dd($komuditi_current);
|
||||||
$unit_current = $komuditi_current['unit_komuditi'];
|
$unit_current = $komuditi_current['unit_komuditi'];
|
||||||
|
|
||||||
|
|||||||
@@ -31,6 +31,15 @@ class OtpController extends Controller
|
|||||||
return response()->json($otp);
|
return response()->json($otp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getOtpUsed($nokp){
|
||||||
|
$current = Carbon::now();
|
||||||
|
$current = new Carbon();
|
||||||
|
|
||||||
|
$otp = OtpToken::on('mysql7')->where([['nokp','=',$nokp],['used','=',1]])->get();
|
||||||
|
|
||||||
|
return response()->json($otp);
|
||||||
|
}
|
||||||
|
|
||||||
public function checkToken($otp_token){
|
public function checkToken($otp_token){
|
||||||
$current = Carbon::now();
|
$current = Carbon::now();
|
||||||
$current = new Carbon();
|
$current = new Carbon();
|
||||||
|
|||||||
@@ -81,6 +81,25 @@ class TunaiController extends Controller
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function UpdateTunaiGadaianTebus($kodcaw, $kodlaluan, Request $request)
|
||||||
|
{
|
||||||
|
|
||||||
|
$current = Carbon::now();
|
||||||
|
$current = new Carbon();
|
||||||
|
|
||||||
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||||
|
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $kodlaluan] ])->
|
||||||
|
update(array(
|
||||||
|
'keluar'=>$request->keluar,
|
||||||
|
'masuk'=>$request->masuk,
|
||||||
|
'baki'=>$request->bakiakhir
|
||||||
|
));
|
||||||
|
|
||||||
|
return response()->json($updatetunai, 200);
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -113,7 +132,7 @@ class TunaiController extends Controller
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getCurrentTunai($kodcaw,$kodlaluan)
|
public function getCurrentTunai($kodcaw,Request $request)
|
||||||
{
|
{
|
||||||
|
|
||||||
$current = Carbon::now();
|
$current = Carbon::now();
|
||||||
@@ -122,7 +141,7 @@ class TunaiController extends Controller
|
|||||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||||
|
|
||||||
$tunai=Tunai::on($cawangan['mysql'])
|
$tunai=Tunai::on($cawangan['mysql'])
|
||||||
->where([['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()],['kodlaluan','=',$kodlaluan]])
|
->where([['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()],['kodlaluan','=',$request->kodlaluan]])
|
||||||
->orderBy('tarikh','desc')
|
->orderBy('tarikh','desc')
|
||||||
->first();
|
->first();
|
||||||
return response()->json($tunai);
|
return response()->json($tunai);
|
||||||
@@ -186,16 +205,16 @@ class TunaiController extends Controller
|
|||||||
return response()->json($requestteller);
|
return response()->json($requestteller);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function updateRequestTeller($kodcaw,$kodlaluan,Request $request)
|
public function updateRequestTeller($kodcaw,Request $request)
|
||||||
{
|
{
|
||||||
$requestteller = RequestTeller::on('mysql7')->where([['no','=',$request->no],['kodcaw','=',$kodcaw],['kodlaluan','=',$kodlaluan],['update','=',0]])->update(array(
|
$requestteller = RequestTeller::on('mysql7')->where([['no','=',$request->no],['kodcaw','=',$kodcaw],['kodlaluan','=',$request->kodlaluan],['update','=',0]])->update(array(
|
||||||
|
|
||||||
'update' => 1
|
'update' => 1
|
||||||
|
|
||||||
) );
|
) );
|
||||||
}
|
}
|
||||||
|
|
||||||
public function createRequestTeller($kodcaw,$kodlaluan,Request $request)
|
public function createRequestTeller($kodcaw,Request $request)
|
||||||
{
|
{
|
||||||
|
|
||||||
$current = Carbon::now();
|
$current = Carbon::now();
|
||||||
@@ -205,9 +224,27 @@ class TunaiController extends Controller
|
|||||||
|
|
||||||
'tarikh' => $current->toDateString(),
|
'tarikh' => $current->toDateString(),
|
||||||
'kodcaw' => $kodcaw,
|
'kodcaw' => $kodcaw,
|
||||||
'kodlaluan'=> $kodlaluan,
|
'kodlaluan' => $request->kodlaluan,
|
||||||
'modal'=>$request->modal,
|
'modal' => $request->modal,
|
||||||
'serahan'=>$request->serahan,
|
'serahan' => $request->serahan,
|
||||||
|
'bd1' => $request->bd1,
|
||||||
|
'bd5' => $request->bd5,
|
||||||
|
'bd10' => $request->bd10,
|
||||||
|
'bd20' => $request->bd20,
|
||||||
|
'bd50' => $request->bd50,
|
||||||
|
'bd100' => $request->bd100,
|
||||||
|
'txtring1' => $request->txtring1,
|
||||||
|
'txtring5' => $request->txtring5,
|
||||||
|
'txtring10' => $request->txtring10,
|
||||||
|
'txtring20' => $request->txtring20,
|
||||||
|
'txtring50' => $request->txtring50,
|
||||||
|
'txtring100' => $request->txtring100,
|
||||||
|
'txtring1000' => $request->txtring1000,
|
||||||
|
'txtsen1' => $request->txtsen1,
|
||||||
|
'txtsen5' => $request->txtsen5,
|
||||||
|
'txtsen10' => $request->txtsen10,
|
||||||
|
'txtsen20' => $request->txtsen20,
|
||||||
|
'txtsen50' => $request->txtsen50,
|
||||||
'update' => '0'
|
'update' => '0'
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ use App\Vault;
|
|||||||
use App\Cawangan;
|
use App\Cawangan;
|
||||||
use App\Tunai;
|
use App\Tunai;
|
||||||
use App\AddTunai;
|
use App\AddTunai;
|
||||||
|
use App\GlDetail;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
@@ -92,4 +93,31 @@ class VaultController extends Controller
|
|||||||
return response()->json($vaultcreate,201);
|
return response()->json($vaultcreate,201);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//GLDETAIL ONLINE
|
||||||
|
|
||||||
|
public function creategldetailonline($kodcaw,Request $request)
|
||||||
|
{
|
||||||
|
$current = Carbon::now();
|
||||||
|
$current = new Carbon();
|
||||||
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||||
|
|
||||||
|
$gldetail=GlDetail::on($cawangan['mysql'])->create([
|
||||||
|
'kodcaw' => $request->kodcaw,
|
||||||
|
'tarikh' => $current->toDateString(),
|
||||||
|
'dtacct' => '1000/020',
|
||||||
|
'ktacct' => '1000/010',
|
||||||
|
'descpt' => 'SERAHAN BAYAR ONLINE',
|
||||||
|
'acttype' => 'A',
|
||||||
|
'fracttype' => 'A',
|
||||||
|
'amaun' => $request->amaun,
|
||||||
|
'teller' => 'ONLINE',
|
||||||
|
'terima' => '*'
|
||||||
|
]);
|
||||||
|
|
||||||
|
return response()->json($gldetail,201);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
+1
-1
@@ -15,7 +15,7 @@ class OtpToken extends Model
|
|||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
protected $fillable = [
|
protected $fillable = [
|
||||||
'nokp','token','used','expired'
|
'nokp','token','used','expired','kodcaw'
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -13,7 +13,8 @@ class RequestTeller extends Model
|
|||||||
*
|
*
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
protected $fillable = ['no','kodlaluan','modal','serahan','tarikh','update','kodcaw'];
|
protected $fillable = ['no','kodlaluan','modal','serahan','tarikh','update','kodcaw','bd1','bd5','bd10','bd20','bd50','bd100','txtring1','txtring5','txtring10','txtring20',
|
||||||
|
'txtring50','txtring100','txtring1000','txtsen1','txtsen5','txtsen10','txtsen20','txtsen50'];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The attributes excluded from the model's JSON form.
|
* The attributes excluded from the model's JSON form.
|
||||||
|
|||||||
+32
-18
@@ -156,6 +156,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
|
|||||||
//OTP API
|
//OTP API
|
||||||
$router->post('otp/generateotp/{nokp}',['uses'=>'OtpController@createOtp']);
|
$router->post('otp/generateotp/{nokp}',['uses'=>'OtpController@createOtp']);
|
||||||
$router->get('otp/{nokp}',['uses'=>'OtpController@getOtp']);
|
$router->get('otp/{nokp}',['uses'=>'OtpController@getOtp']);
|
||||||
|
$router->get('otp/used/{nokp}',['uses'=>'OtpController@getOtpUsed']);
|
||||||
$router->get('otp/check/{otp_token}',['uses'=>'OtpController@checkToken']);
|
$router->get('otp/check/{otp_token}',['uses'=>'OtpController@checkToken']);
|
||||||
$router->put('otp/update_otp',['uses'=>'OtpController@usedOTP']);
|
$router->put('otp/update_otp',['uses'=>'OtpController@usedOTP']);
|
||||||
|
|
||||||
@@ -171,7 +172,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
|
|||||||
//LAPORAN API
|
//LAPORAN API
|
||||||
$router->get('kawalanstok/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanKawalanStok']); //laporan kawalanstok
|
$router->get('kawalanstok/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanKawalanStok']); //laporan kawalanstok
|
||||||
$router->get('lelongan/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelongan']); //laporan lelongan
|
$router->get('lelongan/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelongan']); //laporan lelongan
|
||||||
|
$router->get('gadai/aging/test/{kodcaw}/{tarikh}/{num}',['uses'=>'GadaiController@carian_AgingBulanan']);
|
||||||
|
$router->get('gadai/aging/lebih12bulan/{kodcaw}/{tarikh}', ['uses'=>'GadaiController@carian_agingLebih12_Bulan']);
|
||||||
|
$router->get('gadai/JumlahagingBulanan/test/{kodcaw}/{tarikh}',['uses'=>'GadaiController@carian_Seluruh_AgingBulanan']);
|
||||||
|
|
||||||
//API BARU
|
//API BARU
|
||||||
$router->get('Dashboard_all/{kodcaw}',['uses'=>'GadaiController@dashboardall']);
|
$router->get('Dashboard_all/{kodcaw}',['uses'=>'GadaiController@dashboardall']);
|
||||||
@@ -182,17 +185,19 @@ $router->group(['prefix'=>'api'], function () use ($router){
|
|||||||
$router->get('TunaiController/{kodcaw}',['uses'=>'TunaiController@listTunai']);
|
$router->get('TunaiController/{kodcaw}',['uses'=>'TunaiController@listTunai']);
|
||||||
$router->post('tunai/daftarTunai/{kodcaw}',['uses'=> 'TunaiController@DaftarTunai']);
|
$router->post('tunai/daftarTunai/{kodcaw}',['uses'=> 'TunaiController@DaftarTunai']);
|
||||||
$router->put('updateTunai/{kodcaw}/{kodlaluan}',['uses'=>'TunaiController@UpdateTunai']);
|
$router->put('updateTunai/{kodcaw}/{kodlaluan}',['uses'=>'TunaiController@UpdateTunai']);
|
||||||
|
$router->put('updateTunaiGT/{kodcaw}/{kodlaluan}',['uses'=>'TunaiController@UpdateTunaiGadaianTebus']);
|
||||||
$router->get('getLatestBaki/{kodcaw}',['uses'=>'TunaiController@sumBakiTunai']);
|
$router->get('getLatestBaki/{kodcaw}',['uses'=>'TunaiController@sumBakiTunai']);
|
||||||
$router->post('add/addTunai/{kodcaw}',['uses'=> 'TunaiController@create']);
|
$router->post('add/addTunai/{kodcaw}',['uses'=> 'TunaiController@create']);
|
||||||
$router->get('listSerahMarhunController/{kodcaw}',['uses'=>'TebusController@listPenebusanBaru']);
|
$router->get('listSerahMarhunController/{kodcaw}',['uses'=>'TebusController@listPenebusanBaru']);
|
||||||
$router->get('SenaraiPenebusanKhazanah/{kodcaw}',['uses'=>'TebusController@listSerahKhazanah']);
|
$router->get('SenaraiPenebusanKhazanah/{kodcaw}',['uses'=>'TebusController@listSerahKhazanah']);
|
||||||
$router->get('GetCurrentTunai/{kodcaw}/{kodlaluan}',['uses' =>'TunaiController@getCurrentTunai']);
|
$router->get('GetCurrentTunai/{kodcaw}',['uses' =>'TunaiController@getCurrentTunai']);
|
||||||
$router->get('getAddTunai/{kodcaw}/',['uses' =>'TunaiController@getAddTunai']);
|
$router->get('getAddTunai/{kodcaw}/',['uses' =>'TunaiController@getAddTunai']);
|
||||||
$router->get('getAddTunai/{kodcaw}/{kodlaluan}',['uses' =>'TunaiController@getAddTunaibyKodlaluan']);
|
$router->get('getAddTunai/{kodcaw}/{kodlaluan}',['uses' =>'TunaiController@getAddTunaibyKodlaluan']);
|
||||||
$router->put('gadai/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@GadaiHapus']);
|
$router->put('gadai/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@GadaiHapus']);
|
||||||
$router->put('tebus/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@TebusHapus']);
|
$router->put('tebus/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@TebusHapus']);
|
||||||
$router->put('gadai/edit/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@deletemarhun']); //deletemarhun edit
|
$router->put('gadai/edit/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@deletemarhun']); //deletemarhun edit
|
||||||
$router->put('gadai/ubah/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@editmarhun']); //editmarhun edit
|
$router->put('gadai/ubah/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@editmarhun']); //editmarhun edit
|
||||||
|
$router->post('gldetail/{kodcaw}',['uses'=> 'VaultController@creategldetailonline']); //Gldetail Online
|
||||||
|
|
||||||
|
|
||||||
//API PANJAR KHAZANAH
|
//API PANJAR KHAZANAH
|
||||||
@@ -205,6 +210,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
|
|||||||
|
|
||||||
//API KELULUSAN
|
//API KELULUSAN
|
||||||
$router->get('SenaraiKelulusan/{kodcaw}',['uses'=>'KelulusanController@list']);
|
$router->get('SenaraiKelulusan/{kodcaw}',['uses'=>'KelulusanController@list']);
|
||||||
|
$router->get('RekodDahLepas/{kodcaw}',['uses'=>'KelulusanController@rekodlepas']);
|
||||||
$router->get('SenaraiDahLulus/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@listdahlulus']);
|
$router->get('SenaraiDahLulus/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@listdahlulus']);
|
||||||
$router->put('UpdateKelulusan/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@update']);
|
$router->put('UpdateKelulusan/{kodcaw}/{norujukan}',['uses'=>'KelulusanController@update']);
|
||||||
$router->post('CreateKelulusan/{kodcaw}/{norujukan}/roles/{roles}',['uses'=>'KelulusanController@create']);
|
$router->post('CreateKelulusan/{kodcaw}/{norujukan}/roles/{roles}',['uses'=>'KelulusanController@create']);
|
||||||
@@ -214,12 +220,10 @@ $router->group(['prefix'=>'api'], function () use ($router){
|
|||||||
$router->get('GetLulusAll/{kodcaw}/',['uses'=>'KelulusanController@listkepohonan']);
|
$router->get('GetLulusAll/{kodcaw}/',['uses'=>'KelulusanController@listkepohonan']);
|
||||||
$router->get('ListOperasi/',['uses'=>'KelulusanController@listoperasi']);
|
$router->get('ListOperasi/',['uses'=>'KelulusanController@listoperasi']);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//API REQUEST TELLER
|
//API REQUEST TELLER
|
||||||
$router->post('requestTeller/{kodcaw}/{kodlaluan}',['uses' => 'TunaiController@createRequestTeller']);
|
$router->post('requestTeller/{kodcaw}',['uses' => 'TunaiController@createRequestTeller']);
|
||||||
$router->get('requestTeller/get/{kodcaw}',['uses' => 'TunaiController@getRequestTeller']);
|
$router->get('requestTeller/get/{kodcaw}',['uses' => 'TunaiController@getRequestTeller']);
|
||||||
$router->put('requestTeller/update/{kodcaw}/{kodlaluan}',['uses' => 'TunaiController@updateRequestTeller']);
|
$router->put('requestTeller/update/{kodcaw}',['uses' => 'TunaiController@updateRequestTeller']);
|
||||||
|
|
||||||
//API WAKIL
|
//API WAKIL
|
||||||
$router->get('getwakil/{kodcaw}',['uses' => 'TebusController@AllWakil']);
|
$router->get('getwakil/{kodcaw}',['uses' => 'TebusController@AllWakil']);
|
||||||
@@ -257,23 +261,33 @@ $router->group(['prefix'=>'e-arrahn'], function () use ($router){
|
|||||||
});
|
});
|
||||||
|
|
||||||
$router->group(['prefix'=>'mobile'], function () use ($router){
|
$router->group(['prefix'=>'mobile'], function () use ($router){
|
||||||
|
|
||||||
$router->get('customers/{ic}',['uses'=>'CustomerController@showOneCustomerByICMobile']);
|
$router->get('customers/{ic}',['uses'=>'CustomerController@showOneCustomerByICMobile']);
|
||||||
$router->get('customers/{ic}/gadai/{status}/{kodcaw}',['uses'=>'CustomerController@showOneCustomerGadaiByCawanganMobile']);
|
|
||||||
$router->get('customers/{ic}/gadai/amaran/lelong',['uses'=>'CustomerController@show6BlnGadai']);
|
|
||||||
|
|
||||||
$router->get('harga_emas',['uses'=>'HargaEmasController@showAllHargaEmasMobile']);
|
|
||||||
|
|
||||||
$router->get('gadai/norujukan/{nokp}',['uses'=>'CustomerController@listNorujukanMobile']);
|
|
||||||
$router->get('gadai/norujukan/count/{nokp}',['uses'=>'CustomerController@countNorujukanMobile']);
|
|
||||||
$router->post('gadai/detail/norujukan',['uses'=>'CustomerController@getGadaiDetailMobile']);
|
$router->post('gadai/detail/norujukan',['uses'=>'CustomerController@getGadaiDetailMobile']);
|
||||||
|
|
||||||
$router->put('customers/update/{nokp}', ['uses' => 'CustomerController@customerUpdate']);
|
//utama
|
||||||
|
$router->get('customers/{ic}/gadai/amaran/lelong',['uses'=>'CustomerController@show6BlnGadai']);
|
||||||
|
$router->get('harga_emas',['uses'=>'HargaEmasController@showAllHargaEmasMobile']);
|
||||||
|
$router->get('gadai/norujukan/count/{nokp}',['uses'=>'CustomerController@countNorujukanMobile']);
|
||||||
|
$router->get('gadai/norujukan/{nokp}',['uses'=>'CustomerController@listNorujukanMobile']);
|
||||||
|
$router->get('akaun-bank/{nokp}',['uses'=>'CustomerController@akaunBankMobile']);
|
||||||
|
$router->get('bank-listing',['uses'=>'CustomerController@bankListMobile']);
|
||||||
|
$router->post('insert/akaun-bank',['uses'=>'CustomerController@insertAkaunBankMobile']);
|
||||||
|
|
||||||
$router->get('otp/{nokp}',['uses'=>'OtpController@getOtp']);
|
//gadaian
|
||||||
$router->get('otp/check/{otp_token}',['uses'=>'OtpController@checkToken']);
|
$router->get('gadai/{noic}',['uses'=>'GadaiController@showOneGadaiMobile']);
|
||||||
$router->put('otp/update_otp',['uses'=>'OtpController@usedOTP']);
|
$router->get('customers/{ic}/gadaitebuslelong/{kodcaw}',['uses'=>'CustomerController@gadaiTebusLelongByCawanganMobile']);
|
||||||
|
|
||||||
|
//profile
|
||||||
|
$router->post('customers/update/{nokp}', ['uses' => 'CustomerController@customerUpdate']);
|
||||||
|
|
||||||
|
//register
|
||||||
|
$router->get('otp/{nokp}',['uses'=>'OtpController@getOtp']);
|
||||||
|
$router->get('otp/check/{otp_token}',['uses'=>'OtpController@checkToken']);
|
||||||
|
$router->put('otp/update_otp',['uses'=>'OtpController@usedOTP']);
|
||||||
|
|
||||||
|
$router->post('send-email', ['uses' => 'CustomerController@sendEmail']);
|
||||||
|
|
||||||
$router->get('gadai/{noic}',['uses'=>'GadaiController@showOneGadaiMobile']);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
$router->group(['prefix'=>'dashboard'], function () use ($router){
|
$router->group(['prefix'=>'dashboard'], function () use ($router){
|
||||||
|
|||||||
Reference in New Issue
Block a user