Merge branch 'apiaku' into 'master'

change gldetail and request teller

See merge request online-sistem1/api_arrahn!29

app/GlDetail.php

@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class AnsRugi extends Model
+class GlDetail extends Model
 {
     protected $table = 'gldetail';
     public $timestamps = false;

app/Http/Controllers/TunaiController.php

@@ -132,7 +132,7 @@ class TunaiController extends Controller
 
     }
 
-    public function getCurrentTunai($kodcaw,$kodlaluan)
+    public function getCurrentTunai($kodcaw,Request $request)
     {
 
         $current = Carbon::now();
@@ -141,7 +141,7 @@ class TunaiController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $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')
         ->first();
         return response()->json($tunai);
@@ -205,16 +205,16 @@ class TunaiController extends Controller
         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
       
          ) );
     }
 
-    public function createRequestTeller($kodcaw,$kodlaluan,Request $request)
+    public function createRequestTeller($kodcaw,Request $request)
     {
     
         $current = Carbon::now();
@@ -224,9 +224,27 @@ class TunaiController extends Controller
               
              'tarikh' => $current->toDateString(),
              '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'
         ]);
 

app/Http/Controllers/VaultController.php

@@ -5,6 +5,7 @@ use App\Vault;
 use App\Cawangan;
 use App\Tunai;
 use App\AddTunai;
+use App\GlDetail;
 
 use Illuminate\Http\Request;
 use Carbon\Carbon;
@@ -92,4 +93,31 @@ class VaultController extends Controller
     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);
+
+}
+
+
+
 }

app/RequestTeller.php

@@ -13,7 +13,8 @@ class RequestTeller extends Model
      *
      * @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.

routes/web.php

@@ -190,13 +190,14 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->post('add/addTunai/{kodcaw}',['uses'=> 'TunaiController@create']);
     $router->get('listSerahMarhunController/{kodcaw}',['uses'=>'TebusController@listPenebusanBaru']);
     $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}/{kodlaluan}',['uses' =>'TunaiController@getAddTunaibyKodlaluan']);
     $router->put('gadai/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@GadaiHapus']);
     $router->put('tebus/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@TebusHapus']);
     $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->post('gldetail/{kodcaw}',['uses'=> 'VaultController@creategldetailonline']); //Gldetail Online
 
 
     //API PANJAR KHAZANAH
@@ -220,9 +221,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('ListOperasi/',['uses'=>'KelulusanController@listoperasi']);
     
     //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->put('requestTeller/update/{kodcaw}/{kodlaluan}',['uses' => 'TunaiController@updateRequestTeller']);
+    $router->put('requestTeller/update/{kodcaw}',['uses' => 'TunaiController@updateRequestTeller']);
     
     //API WAKIL
     $router->get('getwakil/{kodcaw}',['uses' => 'TebusController@AllWakil']);