Merge branch 'ujrah_master' of https://bitbucket.org/arrahn-pkb/api_arrahn into finadev

app/Helper.php

@@ -59,15 +59,7 @@ class Helper
 
         };
 
-        $all_cawangan_db_connection = Cache::store('file')->get('active_cawangan_db_connection');
+        return $queryActiveCawanganDbConnection();
-
-        if ($all_cawangan_db_connection === null or count($all_cawangan_db_connection) === 0) {
-            $all_cawangan_db_connection = $queryActiveCawanganDbConnection();
-            Cache::store('file')->put('active_cawangan_db_connection', $all_cawangan_db_connection, 3600);
-        }
-
-        return $all_cawangan_db_connection;
-
     }
 
     public static function getInactiveCawanganDbConnection()

app/Http/Controllers/TebusController.php

@@ -37,6 +37,7 @@ use App\StokAudit12;
 
 use App\AkruNet;
 use App\Services\MasterServices;
+use App\WakilSurat;
 use Illuminate\Http\Request;
 
 use Illuminate\Support\Facades\Log;
@@ -533,6 +534,14 @@ class TebusController extends Controller
         return response()->json($wakil,200);
     }
 
+    public function getSuratWakil($kodcaw, $norujukan){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $wakil_surat = WakilSurat::on($cawangan['mysql'])->where('norujukan', $norujukan)->select('no_surat')->first();
+
+        return response()->json($wakil_surat,200);
+    }
+
     public function createWakil($kodcaw,$icno,Request $request){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 

app/Http/Controllers/WakilController.php

@@ -37,7 +37,7 @@ class WakilController extends Controller
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw', '=', $kodcaw)->first();
 
-        $wakil_surat = WakilSurat::on($cawangan['mysql'])->where('t_cetak', '=', $t_cetak)->orderBy('nosiri', 'desc')->first();
+        $wakil_surat = WakilSurat::on($cawangan['mysql'])->where('t_cetak', '=', $t_cetak)->orderBy('id', 'desc')->first();
 
         return response()->json($wakil_surat);
     }

routes/web.php

@@ -387,6 +387,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('firstwakil/{kodcaw}',['uses' => 'TebusController@FirstWakil']);
     $router->get('getwakil/{kodcaw}/{icno}',['uses' => 'TebusController@getWakil']);
     $router->get('getwakil/{kodcaw}/code/{nowakil}',['uses' => 'TebusController@getWakilbycode']);
+    $router->get('getsuratwakil/{kodcaw}/{norujukan}',['uses' => 'TebusController@getSuratWakil']);
     $router->put('ubahwakil/{kodcaw}',['uses'=>'TebusController@UbahWakil']);
     $router->post('createwakil/{kodcaw}/{icno}',['uses' => 'TebusController@createWakil']);
     $router->get('getwakil/{kodcaw}/status/{status}',['uses' => 'TebusController@getWakilbyStatus']);