Merged in hotfix/servercode (pull request #53)

Hotfix/servercode

.env.example.local

@@ -0,0 +1,323 @@
+APP_NAME=Laravel
+APP_ENV=local
+APP_KEY=
+APP_DEBUG=true
+APP_URL=http://localhost
+APP_PEMBIDA=http://localhost:8080/
+API_URL=https://api_arrahn.test/lelong/
+API_URL_KAUNTER=http://kaunter.test/
+API_VERIFY = false
+
+LOG_CHANNEL=stack
+LOG_DEPRECATIONS_CHANNEL=null
+LOG_LEVEL=debug
+
+DB_CONNECTION=mysql_local
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=lelong
+DB_USERNAME=root
+DB_PASSWORD=G0dz!ll4@2020
+
+DB_CONNECTION_MAIN=mysql_local
+DB_HOST_MAIN=192.168.0.101
+DB_PORT_MAIN=3306
+DB_DATABASE_MAIN=online_arrahn
+DB_USERNAME_MAIN=spider
+DB_PASSWORD_MAIN=G0dz!ll42020
+
+DB_CONNECTION_KB2=mysql_local
+DB_HOST_KB2=192.168.0.101
+DB_PORT_KB2=3306
+DB_DATABASE_KB2=arrahn_kb2
+DB_USERNAME_KB2=spider
+DB_PASSWORD_KB2=G0dz!ll42020
+
+DB_CONNECTION_WCY=mysql_local
+DB_HOST_WCY=192.168.0.101
+DB_PORT_WCY=3306
+DB_DATABASE_WCY=arrahn_wcy
+DB_USERNAME_WCY=spider
+DB_PASSWORD_WCY=G0dz!ll42020
+
+DB_CONNECTION_1STOP=mysql_local
+DB_HOST_1STOP=192.168.0.101
+DB_PORT_1STOP=3306
+DB_DATABASE_1STOP=arrahn_1stop
+DB_USERNAME_1STOP=spider
+DB_PASSWORD_1STOP=G0dz!ll42020
+
+DB_CONNECTION_020301=mysql_local
+DB_HOST_020301=192.168.0.101
+DB_PORT_020301=3306
+DB_DATABASE_020301=arrahn_jlwt
+DB_USERNAME_020301=spider
+DB_PASSWORD_020301=G0dz!ll42020
+
+DB_CONNECTION_WB=mysql_local
+DB_HOST_WB=192.168.0.101
+DB_PORT_WB=3306
+DB_DATABASE_WB=arrahn_wb
+DB_USERNAME_WB=spider
+DB_PASSWORD_WB=G0dz!ll42020
+
+DB_CONNECTION_ALS=mysql_local
+DB_HOST_ALS=192.168.0.101
+DB_PORT_ALS=3306
+DB_DATABASE_ALS=arrahn_kls
+DB_USERNAME_ALS=spider
+DB_PASSWORD_ALS=G0dz!ll42020
+
+DB_CONNECTION_020306=mysql_local
+DB_HOST_020306=192.168.0.101
+DB_PORT_020306=3306
+DB_DATABASE_020306=arrahn_pp
+DB_USERNAME_020306=spider
+DB_PASSWORD_020306=G0dz!ll42020
+
+DB_CONNECTION_ARM=mysql_local
+DB_HOST_ARM=192.168.0.101
+DB_PORT_ARM=3306
+DB_DATABASE_ARM=arrahn_mace
+DB_USERNAME_ARM=spider
+DB_PASSWORD_ARM=G0dz!ll42020
+
+DB_CONNECTION_KB1=mysql_local
+DB_HOST_KB1=192.168.0.101
+DB_PORT_KB1=3306
+DB_DATABASE_KB1=arrahn_kb1
+DB_USERNAME_KB1=spider
+DB_PASSWORD_KB1=G0dz!ll42020
+
+DB_CONNECTION_APM=mysql_local
+DB_HOST_APM=192.168.0.101
+DB_PORT_APM=3306
+DB_DATABASE_APM=arrahn_pm
+DB_USERNAME_APM=spider
+DB_PASSWORD_APM=G0dz!ll42020
+
+DB_CONNECTION_010311=mysql_local
+DB_HOST_010311=192.168.0.101
+DB_PORT_010311=3306
+DB_DATABASE_010311=arrahn_gm
+DB_USERNAME_010311=spider
+DB_PASSWORD_010311=G0dz!ll42020
+
+DB_CONNECTION_GC=mysql_local
+DB_HOST_GC=192.168.0.101
+DB_PORT_GC=3306
+DB_DATABASE_GC=arrahn_gcl
+DB_USERNAME_GC=spider
+DB_PASSWORD_GC=G0dz!ll42020
+
+DB_CONNECTION_JLI=mysql_local
+DB_HOST_JLI=192.168.0.101
+DB_PORT_JLI=3306
+DB_DATABASE_JLI=arrahn_jli
+DB_USERNAME_JLI=spider
+DB_PASSWORD_JLI=G0dz!ll42020
+
+DB_CONNECTION_ARP=mysql_local
+DB_HOST_ARP=192.168.0.101
+DB_PORT_ARP=3306
+DB_DATABASE_ARP=arrahn_rp
+DB_USERNAME_ARP=spider
+DB_PASSWORD_ARP=G0dz!ll42020
+
+DB_CONNECTION_010621=mysql_local
+DB_HOST_010621=192.168.0.101
+DB_PORT_010621=3306
+DB_DATABASE_010621=arrahn_ktn
+DB_USERNAME_010621=spider
+DB_PASSWORD_010621=G0dz!ll42020
+
+DB_CONNECTION_010136=mysql_local
+DB_HOST_010136=192.168.0.101
+DB_PORT_010136=3306
+DB_DATABASE_010136=arrahn_pg
+DB_USERNAME_010136=spider
+DB_PASSWORD_010136=G0dz!ll42020
+
+DB_CONNECTION_011235=mysql_local
+DB_HOST_011235=192.168.0.101
+DB_PORT_011235=3306
+DB_DATABASE_011235=arrahn_skudai
+DB_USERNAME_011235=spider
+DB_PASSWORD_011235=G0dz!ll42020
+
+DB_CONNECTION_011227=mysql_local
+DB_HOST_011227=192.168.0.101
+DB_PORT_011227=3306
+DB_DATABASE_011227=arrahn_pttn
+DB_USERNAME_011227=spider
+DB_PASSWORD_011227=G0dz!ll42020
+
+DB_CONNECTION_010620=mysql_local
+DB_HOST_010620=192.168.0.101
+DB_PORT_010620=3306
+DB_DATABASE_010620=arrahn_btg
+DB_USERNAME_010620=spider
+DB_PASSWORD_010620=G0dz!ll42020
+
+DB_CONNECTION_010617=mysql_local
+DB_HOST_010617=192.168.0.101
+DB_PORT_010617=3306
+DB_DATABASE_010617=arrahn_raub
+DB_USERNAME_010617=spider
+DB_PASSWORD_010617=G0dz!ll42020
+
+DB_CONNECTION_010915=mysql_local
+DB_HOST_010915=192.168.0.101
+DB_PORT_010915=3306
+DB_DATABASE_010915=arrahn_kgr
+DB_USERNAME_010915=spider
+DB_PASSWORD_010915=G0dz!ll42020
+
+DB_CONNECTION_011228=mysql_local
+DB_HOST_011228=192.168.0.101
+DB_PORT_011228=3306
+DB_DATABASE_011228=arrahn_sdk
+DB_USERNAME_011228=spider
+DB_PASSWORD_011228=G0dz!ll42020
+
+DB_CONNECTION_010219=mysql_local
+DB_HOST_010219=192.168.0.101
+DB_PORT_010219=3306
+DB_DATABASE_010219=arrahn_sp
+DB_USERNAME_010219=spider
+DB_PASSWORD_010219=G0dz!ll42020
+
+DB_CONNECTION_011229=mysql_local
+DB_HOST_011229=192.168.0.101
+DB_PORT_011229=3306
+DB_DATABASE_011229=arrahn_twu
+DB_USERNAME_011229=spider
+DB_PASSWORD_011229=G0dz!ll42020
+
+DB_CONNECTION_011230=mysql_local
+DB_HOST_011230=192.168.0.101
+DB_PORT_011230=3306
+DB_DATABASE_011230=arrahn_api2
+DB_USERNAME_011230=spider
+DB_PASSWORD_011230=G0dz!ll42020
+
+DB_CONNECTION_011013=mysql_local
+DB_HOST_011013=192.168.0.101
+DB_PORT_011013=3306
+DB_DATABASE_011013=arrahn_kjg
+DB_USERNAME_011013=spider
+DB_PASSWORD_011013=G0dz!ll42020
+
+DB_CONNECTION_011412=mysql_local
+DB_HOST_011412=192.168.0.101
+DB_PORT_011412=3306
+DB_DATABASE_011412=arrahn_rl
+DB_USERNAME_011412=spider
+DB_PASSWORD_011412=G0dz!ll42020
+
+DB_CONNECTION_011231=mysql_local
+DB_HOST_011231=192.168.0.101
+DB_PORT_011231=3306
+DB_DATABASE_011231=arrahn_bfort
+DB_USERNAME_011231=spider
+DB_PASSWORD_011231=G0dz!ll42020
+
+DB_CONNECTION_011232=mysql_local
+DB_HOST_011232=192.168.0.101
+DB_PORT_011232=3306
+DB_DATABASE_011232=arrahn_kbelud
+DB_USERNAME_011232=spider
+DB_PASSWORD_011232=G0dz!ll42020
+
+DB_CONNECTION_011234=mysql_local
+DB_HOST_011234=192.168.0.101
+DB_PORT_011234=3306
+DB_DATABASE_011234=arrahn_tuaran
+DB_USERNAME_011234=spider
+DB_PASSWORD_011234=G0dz!ll42020
+
+DB_CONNECTION_011233=mysql_local
+DB_HOST_011233=192.168.0.101
+DB_PORT_011233=3306
+DB_DATABASE_011233=arrahn_kngau
+DB_USERNAME_011233=spider
+DB_PASSWORD_011233=G0dz!ll42020
+
+DB_CONNECTION_020303=mysql_local
+DB_HOST_020303=192.168.0.101
+DB_PORT_020303=3306
+DB_DATABASE_020303=arrahn_tm
+DB_USERNAME_020303=spider
+DB_PASSWORD_020303=G0dz!ll42020
+
+DB_CONNECTION_010618=mysql_local
+DB_HOST_010618=192.168.0.101
+DB_PORT_010618=3306
+DB_DATABASE_010618=arrahn_tmlh
+DB_USERNAME_010618=spider
+DB_PASSWORD_010618=G0dz!ll42020
+
+# DB_CONNECTION_011237=mysql_local
+# DB_HOST_011237=192.168.0.101
+# DB_PORT_011237=3306
+# DB_DATABASE_011237=arrahn_semporna
+# DB_USERNAME_011237=spider
+# DB_PASSWORD_011237=G0dz!ll42020
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+FILESYSTEM_DRIVER=local
+QUEUE_CONNECTION=sync
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+
+MEMCACHED_HOST=127.0.0.1
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_MAILER=smtp
+MAIL_HOST=mailhog
+MAIL_PORT=1025
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=null
+MAIL_FROM_NAME="${APP_NAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+AWS_USE_PATH_STYLE_ENDPOINT=false
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+MARHUN_CAMERAS="Doccamera"
+
+WABOT_API=https://md.wabot.my/api/send.php
+WABOT_INSTANCES_ID=63C26B7AAD21A
+WABOT_TOKEN_KEYS=cbee7e95cf3ffbfa0531d5fddfd44f87
+
+# wabot use for blast message to pembida
+WABOT_API_SECOND=https://md.wabot.my/api/send.php
+WABOT_INSTANCES_ID_SECOND=64892FD7440A6
+WABOT_TOKEN_KEYS_SECOND=cbee7e95cf3ffbfa0531d5fddfd44f87
+
+# for config STORAGE_DIRECTORY, set value without slash at the end
+# STORAGE_DIRECTORY=/Users/UTM/Sites/lelong/storage
+
+ADMIN_EMAIL="admin_1@example.com,admin_2@example.com"
+
+# fill in phone number for local testing
+ADMIN_PHONE_NUMBER=601234566789
+
+ONE_WAY_SMS_USERNAME=apiusername
+ONE_WAY_SMS_PASSWORD=apipassword

app/Http/Controllers/LelongController.php

@@ -54,7 +54,7 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use App\Jobs\HantarMail;
 use App\Jobs\WhatsappPemenang;
-use App\Jobs\AutoTamatlelong;
+use App\Jobs\AutoTamatLelong;
 
 class LelongController extends Controller
 {

app/Http/Controllers/Mobile/LelongMobileController.php

@@ -1539,7 +1539,7 @@ class LelongMobileController extends Controller
 
     public function portalApi(Request $request)
     {
-        $lelong = LelongBid::select('fasa', 't_lelong')
+        $lelong = LelongBid::select('fasa', 't_lelong','hargajual','t_jual')
         ->where([['norujukan', $request->norujukan]])
             ->first();
         return response()->json(['lelong' => $lelong]);

resources/views/includes/head.blade.php

@@ -22,7 +22,7 @@
 {{-- <link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Rounded" rel="stylesheet" /> --}}
 
 <!-- Styles -->
-<link href="{{ asset('css/app.css') }}" rel="stylesheet">
+<link href="{{ mix('css/app.css') }}" rel="stylesheet">
 <link href="{{ asset('css/style.css') }}" rel="stylesheet">
 <link href="{{ asset('css/jquery-confirm.min.css') }}" rel="stylesheet">
 <link href="{{ asset('css/buttons.dataTables.min.css') }}" rel="stylesheet">

resources/views/marhun/marhun.blade.php

@@ -577,7 +577,7 @@
         </div>
     </div>
     <script>
-        marhunPhotoCapturerReloadHttps.reload();
+        //marhunPhotoCapturerReloadHttps.reload();
 
         function clearData() {
             document.getElementById('inputGroupFile04').value = '';

routes/web.php

@@ -26,7 +26,7 @@ Route::get('/test', function () {
 
 Auth::routes();
 
-Route::get('logs', [\Rap2hpoutre\LaravelLogViewer\LogViewerController::class, 'index']);
+Route::get('adminbid-logs', [\Rap2hpoutre\LaravelLogViewer\LogViewerController::class, 'index']);
 
 Route::get('/home','HomeController@index2')->name('home');
 Route::get('/reload-job-detail', 'HomeController@reloadJobDetail')->name('reloadjobdetail');