DONE: update env.prod. for whatsapp jana notis

Reviewed-on: #5
Co-authored-by: ISMAIL MASSERAN <ismail@koppkb.com>
Co-committed-by: ISMAIL MASSERAN <ismail@koppkb.com>

.dockerignore

@@ -0,0 +1,16 @@
+.git
+.gitea
+node_modules
+vendor
+.env
+.env.*
+!.env.example
+!.env.docker.example
+storage/logs
+storage/framework/cache
+storage/framework/sessions
+storage/framework/views
+storage/debugbar
+npm-debug.log
+Dockerfile
+docker-compose.yml

.env.development

@@ -5,6 +5,7 @@ APP_DEBUG=true
 APP_URL=http://localhost
 APP_PEMBIDA=http://localhost:8080/
 API_URL=https://api_arrahn.test/lelong/
+API_UJRAH_URL=https://api_arrahn.test/lelong/
 API_URL_KAUNTER=http://kaunter.test/
 API_VERIFY = false
 
@@ -278,12 +279,12 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 MAIL_MAILER=smtp
-MAIL_HOST=mailhog
+MAIL_HOST=mailpit
 MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS=null
+MAIL_FROM_ADDRESS=noreply@lelong.local
 MAIL_FROM_NAME="${APP_NAME}"
 
 AWS_ACCESS_KEY_ID=

.env.docker

@@ -0,0 +1,128 @@
+APP_NAME="Lelong - Admin"
+APP_ENV=local
+APP_KEY=base64:qelauhvfTopsnZJAxIfOc5CewbCN9zi4pjBfvsmqWdA=
+APP_DEBUG=true
+APP_URL=http://localhost:8082
+APP_PEMBIDA=http://localhost:8083/
+API_URL=http://host.docker.internal:8080/lelong/
+API_UJRAH_URL=http://host.docker.internal:8080/lelong/
+API_URL_KAUNTER=http://host.docker.internal:8081/
+API_VERIFY=false
+
+LOG_CHANNEL=stack
+LOG_DEPRECATIONS_CHANNEL=null
+LOG_LEVEL=debug
+
+DB_CONNECTION=mysql
+DB_HOST=mysql
+DB_PORT=3306
+DB_DATABASE=lelong
+DB_USERNAME=root
+DB_PASSWORD=root
+
+DB_CONNECTION_MAIN=mysql
+DB_HOST_MAIN=mysql
+DB_PORT_MAIN=3306
+DB_DATABASE_MAIN=master_erahn
+DB_USERNAME_MAIN=root
+DB_PASSWORD_MAIN=root
+
+DB_CONNECTION_X0101=mysql
+DB_HOST_X0101=mysql
+DB_PORT_X0101=3306
+DB_DATABASE_X0101=arrahn_ld
+DB_USERNAME_X0101=root
+DB_PASSWORD_X0101=root
+
+DB_CONNECTION_X0201=mysql
+DB_HOST_X0201=mysql
+DB_PORT_X0201=3306
+DB_DATABASE_X0201=erahn_baling
+DB_USERNAME_X0201=root
+DB_PASSWORD_X0201=root
+
+DB_CONNECTION_X0301=mysql
+DB_HOST_X0301=mysql
+DB_PORT_X0301=3306
+DB_DATABASE_X0301=erahn_xtra
+DB_USERNAME_X0301=root
+DB_PASSWORD_X0301=root
+
+DB_CONNECTION_X0401=mysql
+DB_HOST_X0401=mysql
+DB_PORT_X0401=3306
+DB_DATABASE_X0401=erahn_segamat
+DB_USERNAME_X0401=root
+DB_PASSWORD_X0401=root
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+FILESYSTEM_DRIVER=local
+QUEUE_CONNECTION=redis
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+SESSION_COOKIE=lelong_session
+SESSION_SECURE_COOKIE=false
+
+MEMCACHED_HOST=127.0.0.1
+
+REDIS_CLIENT=phpredis
+REDIS_HOST=redis
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_MAILER=smtp
+MAIL_HOST=mailpit
+MAIL_PORT=1025
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=noreply@lelong.local
+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"
+
+# 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
+
+# Meta WhatsApp Cloud API (reuse phone_number_id from other system)
+WHATSAPP_CLOUD_ENABLED=true
+WHATSAPP_TOKEN=
+WHATSAPP_PHONE_NUMBER_ID=
+WHATSAPP_API_VERSION=v25.0
+WHATSAPP_TEMPLATE=hello_world
+WHATSAPP_TEMPLATE_LANG=en_US
+WHATSAPP_JANA_NOTIS_TEMPLATE=hello_world
+WHATSAPP_JANA_NOTIS_TEMPLATE_LANG=en_US
+WHATSAPP_PEMENANG_TEMPLATE=hello_world
+WHATSAPP_PEMENANG_TEMPLATE_LANG=en_US
+WHATSAPP_VERIFY_TOKEN=
+WHATSAPP_APP_SECRET=
+
+ONE_WAY_SMS_USERNAME=apiusername
+ONE_WAY_SMS_PASSWORD=apipassword
+
+BILLPLZ_API_KEY=f0697647-bfc0-41da-8486-5df0d4c8d741
+BILLPLZ_SANDBOX_KOPKB_X_SIGNATURE=33de621397c59551cca9b9a007c7b5913b95d57c06a3422b1e0dceae2e79c4360e20c8a1f5680fdb8880137a1b379db1824e167ae9a80952ddfedb508d8eaac8
+BILLPLZ_SANDBOX_KOPKB_COLLECTION_ID=vbkc2urs
+BILLPLZ_API_URL=https://www.billplz-sandbox.com/api
+BILLPLZ_SANDBOX=true

.env.docker.example

@@ -1,323 +0,0 @@
-APP_NAME=Laravel
-APP_ENV=local
-APP_KEY=base64:ezY+zzzO7+TOh5WtUG544ffDFNCqNQr4c9/uxFCVywo=
-APP_DEBUG=true
-APP_URL=http://localhost
-APP_PEMBIDA=http://localhost:8080/
-API_URL=http://host.docker.internal:8874
-API_URL_KAUNTER=http://kaunter.localhost/
-API_VERIFY=false
-
-LOG_CHANNEL=stack
-LOG_DEPRECATIONS_CHANNEL=null
-LOG_LEVEL=debug
-
-DB_CONNECTION=mysql
-DB_HOST=db_lelong
-DB_PORT=3306
-DB_DATABASE=lelong
-DB_USERNAME=root
-DB_PASSWORD=secret
-
-DB_CONNECTION_MAIN=mysql
-DB_HOST_MAIN=database_zone1
-DB_PORT_MAIN=3306
-DB_DATABASE_MAIN=online_arrahn
-DB_USERNAME_MAIN=root
-DB_PASSWORD_MAIN=secret
-
-DB_CONNECTION_KB2=mysql
-DB_HOST_KB2=database_zone1
-DB_PORT_KB2=3306
-DB_DATABASE_KB2=arrahn_kb2
-DB_USERNAME_KB2=root
-DB_PASSWORD_KB2=secret
-
-DB_CONNECTION_WCY=mysql
-DB_HOST_WCY=database_zone1
-DB_PORT_WCY=3306
-DB_DATABASE_WCY=arrahn_wcy
-DB_USERNAME_WCY=root
-DB_PASSWORD_WCY=secret
-
-DB_CONNECTION_1STOP=mysql
-DB_HOST_1STOP=database_zone1
-DB_PORT_1STOP=3306
-DB_DATABASE_1STOP=arrahn_1stop
-DB_USERNAME_1STOP=root
-DB_PASSWORD_1STOP=secret
-
-DB_CONNECTION_020301=mysql
-DB_HOST_020301=database_zone1
-DB_PORT_020301=3306
-DB_DATABASE_020301=arrahn_jlwt
-DB_USERNAME_020301=root
-DB_PASSWORD_020301=secret
-
-DB_CONNECTION_WB=mysql
-DB_HOST_WB=database_zone1
-DB_PORT_WB=3306
-DB_DATABASE_WB=arrahn_wb
-DB_USERNAME_WB=root
-DB_PASSWORD_WB=secret
-
-DB_CONNECTION_ALS=mysql
-DB_HOST_ALS=database_zone1
-DB_PORT_ALS=3306
-DB_DATABASE_ALS=arrahn_kls
-DB_USERNAME_ALS=root
-DB_PASSWORD_ALS=secret
-
-DB_CONNECTION_020306=mysql
-DB_HOST_020306=database_zone1
-DB_PORT_020306=3306
-DB_DATABASE_020306=arrahn_pp
-DB_USERNAME_020306=root
-DB_PASSWORD_020306=secret
-
-DB_CONNECTION_ARM=mysql
-DB_HOST_ARM=database_zone1
-DB_PORT_ARM=3306
-DB_DATABASE_ARM=arrahn_mace
-DB_USERNAME_ARM=root
-DB_PASSWORD_ARM=secret
-
-DB_CONNECTION_KB1=mysql
-DB_HOST_KB1=database_zone1
-DB_PORT_KB1=3306
-DB_DATABASE_KB1=arrahn_kb1
-DB_USERNAME_KB1=root
-DB_PASSWORD_KB1=secret
-
-DB_CONNECTION_APM=mysql
-DB_HOST_APM=database_zone1
-DB_PORT_APM=3306
-DB_DATABASE_APM=arrahn_pm
-DB_USERNAME_APM=root
-DB_PASSWORD_APM=secret
-
-DB_CONNECTION_010311=mysql
-DB_HOST_010311=database_zone1
-DB_PORT_010311=3306
-DB_DATABASE_010311=arrahn_gm
-DB_USERNAME_010311=root
-DB_PASSWORD_010311=secret
-
-DB_CONNECTION_GC=mysql
-DB_HOST_GC=database_zone1
-DB_PORT_GC=3306
-DB_DATABASE_GC=arrahn_gcl
-DB_USERNAME_GC=root
-DB_PASSWORD_GC=secret
-
-DB_CONNECTION_JLI=mysql
-DB_HOST_JLI=database_zone1
-DB_PORT_JLI=3306
-DB_DATABASE_JLI=arrahn_jli
-DB_USERNAME_JLI=root
-DB_PASSWORD_JLI=secret
-
-DB_CONNECTION_ARP=mysql
-DB_HOST_ARP=database_zone1
-DB_PORT_ARP=3306
-DB_DATABASE_ARP=arrahn_rp
-DB_USERNAME_ARP=root
-DB_PASSWORD_ARP=secret
-
-DB_CONNECTION_010621=mysql
-DB_HOST_010621=database_zone2
-DB_PORT_010621=3306
-DB_DATABASE_010621=arrahn_ktn
-DB_USERNAME_010621=root
-DB_PASSWORD_010621=secret
-
-DB_CONNECTION_010136=mysql
-DB_HOST_010136=database_zone2
-DB_PORT_010136=3306
-DB_DATABASE_010136=arrahn_pg
-DB_USERNAME_010136=root
-DB_PASSWORD_010136=secret
-
-DB_CONNECTION_011235=mysql
-DB_HOST_011235=database_zone2
-DB_PORT_011235=3306
-DB_DATABASE_011235=arrahn_skudai
-DB_USERNAME_011235=root
-DB_PASSWORD_011235=secret
-
-DB_CONNECTION_011227=mysql
-DB_HOST_011227=database_zone2
-DB_PORT_011227=3306
-DB_DATABASE_011227=arrahn_pttn
-DB_USERNAME_011227=root
-DB_PASSWORD_011227=secret
-
-DB_CONNECTION_010620=mysql
-DB_HOST_010620=database_zone2
-DB_PORT_010620=3306
-DB_DATABASE_010620=arrahn_btg
-DB_USERNAME_010620=root
-DB_PASSWORD_010620=secret
-
-DB_CONNECTION_010617=mysql
-DB_HOST_010617=database_zone2
-DB_PORT_010617=3306
-DB_DATABASE_010617=arrahn_raub
-DB_USERNAME_010617=root
-DB_PASSWORD_010617=secret
-
-DB_CONNECTION_010915=mysql
-DB_HOST_010915=database_zone2
-DB_PORT_010915=3306
-DB_DATABASE_010915=arrahn_kgr
-DB_USERNAME_010915=root
-DB_PASSWORD_010915=secret
-
-DB_CONNECTION_011228=mysql
-DB_HOST_011228=database_zone2
-DB_PORT_011228=3306
-DB_DATABASE_011228=arrahn_sdk
-DB_USERNAME_011228=root
-DB_PASSWORD_011228=secret
-
-DB_CONNECTION_010219=mysql
-DB_HOST_010219=database_zone2
-DB_PORT_010219=3306
-DB_DATABASE_010219=arrahn_sp
-DB_USERNAME_010219=root
-DB_PASSWORD_010219=secret
-
-DB_CONNECTION_011229=mysql
-DB_HOST_011229=database_zone2
-DB_PORT_011229=3306
-DB_DATABASE_011229=arrahn_twu
-DB_USERNAME_011229=root
-DB_PASSWORD_011229=secret
-
-DB_CONNECTION_011230=mysql
-DB_HOST_011230=database_zone2
-DB_PORT_011230=3306
-DB_DATABASE_011230=arrahn_api2
-DB_USERNAME_011230=root
-DB_PASSWORD_011230=secret
-
-DB_CONNECTION_011013=mysql
-DB_HOST_011013=database_zone2
-DB_PORT_011013=3306
-DB_DATABASE_011013=arrahn_kjg
-DB_USERNAME_011013=root
-DB_PASSWORD_011013=secret
-
-DB_CONNECTION_011412=mysql
-DB_HOST_011412=database_zone2
-DB_PORT_011412=3306
-DB_DATABASE_011412=arrahn_rl
-DB_USERNAME_011412=root
-DB_PASSWORD_011412=secret
-
-DB_CONNECTION_011231=mysql
-DB_HOST_011231=database_zone2
-DB_PORT_011231=3306
-DB_DATABASE_011231=arrahn_bfort
-DB_USERNAME_011231=root
-DB_PASSWORD_011231=secret
-
-DB_CONNECTION_011232=mysql
-DB_HOST_011232=database_zone2
-DB_PORT_011232=3306
-DB_DATABASE_011232=arrahn_kbelud
-DB_USERNAME_011232=root
-DB_PASSWORD_011232=secret
-
-DB_CONNECTION_011234=mysql
-DB_HOST_011234=database_zone2
-DB_PORT_011234=3306
-DB_DATABASE_011234=arrahn_tuaran
-DB_USERNAME_011234=root
-DB_PASSWORD_011234=secret
-
-DB_CONNECTION_011233=mysql
-DB_HOST_011233=database_zone2
-DB_PORT_011233=3306
-DB_DATABASE_011233=arrahn_kngau
-DB_USERNAME_011233=root
-DB_PASSWORD_011233=secret
-
-DB_CONNECTION_020303=mysql
-DB_HOST_020303=database_zone1
-DB_PORT_020303=3306
-DB_DATABASE_020303=arrahn_tm
-DB_USERNAME_020303=root
-DB_PASSWORD_020303=secret
-
-DB_CONNECTION_010618=mysql
-DB_HOST_010618=database_zone2
-DB_PORT_010618=3306
-DB_DATABASE_010618=arrahn_tmlh
-DB_USERNAME_010618=root
-DB_PASSWORD_010618=secret
-
-# DB_CONNECTION_011237=mysql
-# DB_HOST_011237=database_zone1
-# DB_PORT_011237=3306
-# DB_DATABASE_011237=arrahn_semporna
-# DB_USERNAME_011237=root
-# DB_PASSWORD_011237=secret
-
-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

.env.example.prod

@@ -1,323 +0,0 @@
-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
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=lelong
-DB_USERNAME=root
-DB_PASSWORD=G0dz!ll4@2020
-
-DB_CONNECTION_MAIN=mysql
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-# 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

.env.production

@@ -0,0 +1,126 @@
+APP_NAME=Lelong
+APP_ENV=production
+APP_KEY=base64:Zdzo2yUe3/rI0OIi9Ykli8qcHc+GUIXViIaRnsBQa+U=
+APP_DEBUG=false
+APP_URL=http://localhost
+APP_PEMBIDA=https://lelong.erahn.com.my/
+API_URL=https://apiujrah.erahn.com.my/lelong/
+API_UJRAH_URL=https://apiujrah.erahn.com.my/lelong/
+API_URL_KAUNTER=https://ujrah.erahn.com.my/
+API_VERIFY=false
+
+LOG_CHANNEL=stack
+LOG_DEPRECATIONS_CHANNEL=null
+LOG_LEVEL=debug
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=lelong
+DB_USERNAME=xtra
+DB_PASSWORD=G0dz!ll4@2020
+
+DB_CONNECTION_MAIN=mysql
+DB_HOST_MAIN=192.168.1.216
+DB_PORT_MAIN=3306
+DB_DATABASE_MAIN=master_erahn
+DB_USERNAME_MAIN=lelong_admin
+DB_PASSWORD_MAIN=xtrabiz_2023
+
+DB_CONNECTION_X0101=mysql
+DB_HOST_X0101=192.168.1.216
+DB_PORT_X0101=3306
+DB_DATABASE_X0101=arrahn_ld
+DB_USERNAME_X0101=lelong_admin
+DB_PASSWORD_X0101=xtrabiz_2023
+
+DB_CONNECTION_X0201=mysql
+DB_HOST_X0201=192.168.1.216
+DB_PORT_X0201=3306
+DB_DATABASE_X0201=erahn_baling
+DB_USERNAME_X0201=lelong_admin
+DB_PASSWORD_X0201=xtrabiz_2023
+
+DB_CONNECTION_X0301=mysql
+DB_HOST_X0301=192.168.1.216
+DB_PORT_X0301=3306
+DB_DATABASE_X0301=erahn_xtra
+DB_USERNAME_X0301=lelong_admin
+DB_PASSWORD_X0301=xtrabiz_2023
+
+DB_CONNECTION_X0401=mysql
+DB_HOST_X0401=192.168.1.216
+DB_PORT_X0401=3306
+DB_DATABASE_X0401=erahn_segamat
+DB_USERNAME_X0401=lelong_admin
+DB_PASSWORD_X0401=xtrabiz_2023
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+FILESYSTEM_DRIVER=local
+QUEUE_CONNECTION=redis
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+SESSION_COOKIE=lelong_session
+SESSION_SECURE_COOKIE=true
+
+MEMCACHED_HOST=127.0.0.1
+
+REDIS_CLIENT=phpredis
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_MAILER=smtp
+MAIL_HOST=smtp.gmail.com
+MAIL_PORT=587
+MAIL_USERNAME=zatizul@gmail.com
+MAIL_PASSWORD=qumuctejnxuomfur
+MAIL_ENCRYPTION=tls
+MAIL_FROM_ADDRESS=zatizul@gmail.com
+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"
+
+# for config STORAGE_DIRECTORY, set value without slash at the end
+# STORAGE_DIRECTORY=/Users/UTM/Sites/lelong/storage
+
+ADMIN_EMAIL="zatizul@gmail.com"
+
+ADMIN_PHONE_NUMBER=
+
+ONE_WAY_SMS_USERNAME=apiusername
+ONE_WAY_SMS_PASSWORD=apipassword
+
+BILLPLZ_API_KEY=f4e099e5-88ca-4712-a01e-b7e1daf78ce2
+BILLPLZ_API_URL=https://api.billplz.com
+BILLPLZ_SANDBOX=false
+
+WHATSAPP_CLOUD_ENABLED=true
+WHATSAPP_TOKEN=EAAZAonT56AO0BSnZAhWLi4UXDRT6iAldbiybxSQZAnGrzIke1QiNWvQkZAbQQTjWeVZC5bL1gEBhW6ff3Shf79nowXiTQEwyxqgZAZB6ZATwFCeTs8MZA5H6ZA76IJBuVqRiAZBvZCfkeSurbUNpEWyi9W7zsT2GWiZCLX8meX0KCfDHu7cp4aBgVu1Ps5ZCRO3bP4ZCQZDZD
+WHATSAPP_PHONE_NUMBER_ID=1375899418935337
+WHATSAPP_API_VERSION=v25.0
+WHATSAPP_TEMPLATE=hello_world
+WHATSAPP_TEMPLATE_LANG=en_US
+WHATSAPP_VERIFY_TOKEN=418ed86d49422071681c76bed25ae1cb7e90456c794a92f1c9ea417945a35a0a
+WHATSAPP_APP_SECRET=
+
+WHATSAPP_JANA_NOTIS_TEMPLATE=jana_notis_lelong
+WHATSAPP_JANA_NOTIS_TEMPLATE_LANG=ms
+
+WHATSAPP_PEMENANG_TEMPLATE=pemenang_bidaan
+WHATSAPP_PEMENANG_TEMPLATE_LANG=ms

README.md

@@ -1 +1,10 @@
-# delete this readme before cloning your repo
+## Jana Notis Send Email to Admin
+
+## Process Flow
+Operasi buat simulasi -> PC Jana Notis -> Khazanah scan marhun keluar -> Penilai upload gambar -> Operasi start lelong balik
+
+## Tag Means
+### cawangan_lelong.tagujrah
+0 = Normal lelong (bukan ujrah)
+1 = Lelong ujrah
+

app/Console/Commands/CheckBillplzPayments.php

@@ -2,21 +2,20 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
+use App\Http\Controllers\ApiController;
-use App\Models\Resit;
 use App\Services\BillplzService;
 use Carbon\Carbon;
-use Illuminate\Support\Facades\DB;
+use Illuminate\Console\Command;
-use App\Models\Payment;
-use App\Http\Controllers\ApiController;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\DB;
 
 class CheckBillplzPayments extends Command
 {
     protected $signature = 'billplz:semak 
     {--date= : Date in YYYY-MM-DD format} 
     {--preview : Preview pending resits only}';
+
     protected $description = 'Check Billplz payment status and update database';
 
     protected $billplzService;
@@ -36,7 +35,8 @@ class CheckBillplzPayments extends Command
         try {
             $dateObj = Carbon::createFromFormat('Y-m-d', $date);
         } catch (\Exception $e) {
-        $this->error("Invalid date format. Use YYYY-MM-DD.");
+            $this->error('Invalid date format. Use YYYY-MM-DD.');
+
             return 1;
         }
 
@@ -62,14 +62,16 @@ class CheckBillplzPayments extends Command
 
         if ($pendingResits->isEmpty()) {
             $this->info('Tiada Resit belum dibayar ditemui.');
+
             return 0;
         }
 
         if ($preview) {
-        $this->info("Preview mode aktif. Senarai Resit:");
+            $this->info('Preview mode aktif. Senarai Resit:');
             foreach ($pendingResits as $resit) {
                 $this->line("Resit ID: {$resit->id} | Billplz ID: {$resit->billplz_id} | Jumlah: RM{$resit->total_payment}");
             }
+
             return 0;
         }
 
@@ -80,6 +82,7 @@ class CheckBillplzPayments extends Command
 
             if (isset($billData['error'])) {
                 $this->error("❌ Gagal semak Billplz untuk Resit {$resit->id}: {$billData['details']}");
+
                 continue;
             }
 
@@ -90,7 +93,7 @@ class CheckBillplzPayments extends Command
                         'id' => $resit->billplz_id,
                         'paid' => 'true',
                         'paid_at' => $billData['paid_at'] ?? now()->toDateTimeString(),
-                ]
+                    ],
                 ];
                 // dd($data);
 
@@ -98,7 +101,6 @@ class CheckBillplzPayments extends Command
                 $apiController->processPaidResit($data);
                 // dd($fakeRequest);
 
-        
                 $this->info("✅ Resit ID {$resit->id} handled via processPaidResit.");
             } else {
                 $this->info("ℹ️ Resit ID {$resit->id} masih belum dibayar.");
@@ -107,6 +109,4 @@ class CheckBillplzPayments extends Command
 
         $this->info('Semakan semula Billplz selesai.');
     }
-
-
 }

app/Console/Commands/WebpMakeExecutables.php

@@ -51,9 +51,9 @@ class WebpMakeExecutables extends Command
         $server_operating_system = explode(' ', trim(php_uname()))[0];
         $server_processor_architecture = trim(php_uname('m'));
 
-
         if ($server_operating_system === 'Windows') {
             $this->error('Windows OS are not permitted');
+
             return;
         }
 

app/Console/Commands/kemaskiniCawanganLelong.php

@@ -42,13 +42,10 @@ class kemaskiniCawanganLelong extends Command
     {
 
         $lelong = Lelong::with('cawangan')->select('id')->get();
-        foreach($lelong as $lel)
+        foreach ($lelong as $lel) {
-        {
+            foreach ($lel->cawangan as $caw) {
-            foreach($lel->cawangan as $caw)
-            {
                 $lelong_bid = LelongBid::where('kodcaw', $caw->caw_code)->where('lelong_id', $lel->id)->first();
-                if($lelong_bid == null)
+                if ($lelong_bid == null) {
-                {
                     CawanganLelong::where('caw_id', $caw->id)->where('lelong_id', $lel->id)->delete();
                 }
             }

app/Console/Commands/kemaskiniLelong.php

@@ -2,14 +2,14 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
-use App\Models\LelongBid;
 use App\Models\Gadai;
-use Carbon\Carbon;
+use App\Models\LelongBid;
-use App\Models\TransaksiKeuntungan;
 use App\Models\LelongTebus;
 use App\Models\LogUser;
+use App\Models\TransaksiKeuntungan;
 use App\Models\User;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Http;
 
 class kemaskiniLelong extends Command
@@ -62,8 +62,7 @@ class kemaskiniLelong extends Command
                 } elseif ($gadai->sttebus == 'L') {
                     $keluar_lelong = true;
                     $sebab_keluar = 'L';
-                }
+                } else {
-                else{
                     $telahbayar = $gadai->hargajualan - $gadai->bakihargajualan;
                     $upah6bln_raw = $gadai->bakiupah - 0.5;
                     if (bcdiv($telahbayar, 1, 1) >= bcdiv($upah6bln_raw, 1, 1)) {
@@ -72,7 +71,7 @@ class kemaskiniLelong extends Command
                         $updategadai = Http::withOptions(['verify' => config('app.api_verify')])
                             ->post(config('app.api_url').'taglel/revert', [
                                 'kodcaw' => $lelongbid->kodcaw,
-                                'norujukan'=>$lelongbid->norujukan
+                                'norujukan' => $lelongbid->norujukan,
                             ])
                             ->json();
                     } else {
@@ -139,11 +138,9 @@ class kemaskiniLelong extends Command
                         $beza_keuntungan = $total_untung_asal - $total_untung_rebet;
                         if ($gadai->tempohbayar == 12) {
                             $keuntungan = 0.00;
-                        }
+                        } elseif ($gadai->tempohbayar == $gadai->tempoh) {
-                        elseif($gadai->tempohbayar == $gadai->tempoh ){
                             $keuntungan = 0.00;
-                        }
+                        } else {
-                        else{
                             $jbg = $gadai->tempoh - $gadai->tempohbayar;
                             $jbg2 = 12 - $gadai->tempohbayar;
                             if ($gadai->tempoh <= '12.00') {
@@ -170,7 +167,6 @@ class kemaskiniLelong extends Command
                         $rounded_onepercent = $ujrahonepercentrebet['onepercent'];
                         $keuntungan = $rounded_ujrah + $rounded_onepercent;
 
-
                         $checkdataxlaku = LelongBid::where('norujukan', $lelongbid->norujukan)
                             ->where('xlaku', 1)
                             ->first();
@@ -219,8 +215,7 @@ class kemaskiniLelong extends Command
                 $loguser->norujukan = $gadai->norujukan;
                 if ($gadai->tagbaru == '0') {
                     $loguser->nota = $lelongbid->lelong_id.' Kemaskini Tempoh/Bakipjm/Keuntungan SAG LAMA';
-                }
+                } elseif ($gadai->tagbaru == '1') {
-                elseif($gadai->tagbaru == '1'){
                     $loguser->nota = $lelongbid->lelong_id.' Kemaskini Tempoh/Bakipjm/Keuntungan UJRAH '.$keuntungan;
                 }
                 $loguser->save();

app/Console/Commands/kemaskiniLelongUjrah.php

@@ -2,14 +2,14 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
-use App\Models\LelongBid;
 use App\Models\Gadai;
-use Carbon\Carbon;
+use App\Models\LelongBid;
-use App\Models\TransaksiKeuntungan;
 use App\Models\LelongTebus;
 use App\Models\LogUser;
+use App\Models\TransaksiKeuntungan;
 use App\Models\User;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Http;
 
 class kemaskiniLelongUjrah extends Command
@@ -63,8 +63,7 @@ class kemaskiniLelongUjrah extends Command
                 } elseif ($gadai->sttebus == 'L') {
                     $keluar_lelong = true;
                     $sebab_keluar = 'L';
-                }
+                } else {
-                else{
                     $telahbayar = $gadai->hargajualan - $gadai->bakihargajualan;
                     $upah6bln_raw = $gadai->bakiupah - 0.5;
                     if (bcdiv($telahbayar, 1, 1) >= bcdiv($upah6bln_raw, 1, 1)) {
@@ -73,7 +72,7 @@ class kemaskiniLelongUjrah extends Command
                         $updategadai = Http::withOptions(['verify' => config('app.api_verify')])
                             ->post(config('app.api_url').'taglel/revert', [
                                 'kodcaw' => $lelongbid->kodcaw,
-                                'norujukan'=>$lelongbid->norujukan
+                                'norujukan' => $lelongbid->norujukan,
                             ])
                             ->json();
                     } else {
@@ -122,13 +121,11 @@ class kemaskiniLelongUjrah extends Command
                         $keuntungan = 0.00;
                         $rounded_ujrah = 0.00;
                         $rounded_onepercent = 0.00;
-                    }
+                    } elseif ($gadai->tempohbayar == $gadai->tempoh) {
-                    elseif($gadai->tempohbayar == $gadai->tempoh ){
                         $keuntungan = 0.00;
                         $rounded_ujrah = 0.00;
                         $rounded_onepercent = 0.00;
-                    }
+                    } else {
-                    else{
                         // kiraan keuntungan ujrah
                         $jeniskeuntungan = 'onepercent';
                         // $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$lelongbid->kodcaw.'/'.$lelongbid->norujukan.'/'.$jeniskeuntungan)->json();

app/Console/Kernel.php

@@ -19,7 +19,6 @@ class Kernel extends ConsoleKernel
     /**
      * Define the application's command schedule.
      *
-     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
      * @return void
      */
     protected function schedule(Schedule $schedule)

app/Events/LelongNotify.php

@@ -2,10 +2,10 @@
 
 namespace App\Events;
 
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
 
 class LelongNotify implements ShouldBroadcast
 {

app/Events/PaymentNotify.php

@@ -2,17 +2,19 @@
 
 namespace App\Events;
 
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
 
 class PaymentNotify implements ShouldBroadcast
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
     public $response;
+
     public $userid;
+
     public $paymentid;
 
     public function __construct($response, $userid, $paymentid)

app/Http/Controllers/AccountController.php

@@ -2,34 +2,30 @@
 
 namespace App\Http\Controllers;
 
+use App\Jobs\WhatsappTidakSahBayaran;
+use App\Models\Cawangan;
+use App\Models\CawanganLelong;
+use App\Models\FileMarhun;
+use App\Models\FileResit;
+use App\Models\Lelong;
+use App\Models\LelongBid;
+use App\Models\LelongBidder;
+use App\Models\LogUser;
+use App\Models\Payment;
+use App\Models\Pengesahan;
+use App\Models\Resit;
+use App\Models\User;
+use App\Services\MarhunPhotoService;
+use App\Services\ResitPhotoService;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-
-use App\Models\User;
-use App\Models\Cawangan;
-use App\Models\CawanganLelong;
-use App\Models\Lelong;
-use App\Models\Payment;
-use App\Models\LelongBid;
-use App\Models\LelongBidder;
-use App\Models\Resit;
-use App\Models\FileResit;
-use App\Services\ResitPhotoService;
-use App\Models\FileMarhun;
-use App\Services\MarhunPhotoService;
-use App\Models\Pengesahan;
-use App\Models\LelongBidMarhun;
-use App\Models\LogUser;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-use App\Jobs\WhatsappPengesahanPembida;
-use App\Jobs\WhatsappTidakSahBayaran;
 use PDF;
 
 class AccountController extends Controller
 {
     private $resitPhotoService;
+
     private $marhunPhotoService;
 
     public function __construct(ResitPhotoService $resitPhotoService, MarhunPhotoService $marhunPhotoService)
@@ -39,7 +35,8 @@ class AccountController extends Controller
         $this->marhunPhotoService = $marhunPhotoService;
     }
 
-    public function senarailelongan(){
+    public function senarailelongan()
+    {
 
         $user = Auth::user();
 
@@ -56,8 +53,7 @@ class AccountController extends Controller
             ->get()
             ->toArray();
 
-        foreach($senarai as $details)
+        foreach ($senarai as $details) {
-        {
 
             $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id', 'caw_name', 'caw_code')
@@ -67,8 +63,7 @@ class AccountController extends Controller
                 ->get()
                 ->toArray();
 
-            if($details['tarikh_lelong'] == $tarikh_semasa)
+            if ($details['tarikh_lelong'] == $tarikh_semasa) {
-            {
                 array_push($arraysms, ['detail' => $details, 'detailsinfo' => $detailsinfo]);
             } else {
                 array_push($arraysls, ['detail' => $details, 'detailsinfo' => $detailsinfo]);
@@ -152,13 +147,12 @@ class AccountController extends Controller
                 }
             }
             $listwinner[$index1]['details'] = $userdetails;
-            $listwinner[$index1]['total_surat'] = sizeof($SAGWin);
+            $listwinner[$index1]['total_surat'] = count($SAGWin);
             $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
             $listwinner[$index1]['totalPay'] = $total_payment;
 
         }
 
-
         return view('account.listbayaranonline', compact('listwinner', 'lelong_id', 'getkodcaw', 'kodcaw'));
     }
 
@@ -279,7 +273,6 @@ class AccountController extends Controller
     //     return view('account.sahsagonline', compact('senaraisag', 'lelong_id', 'user_id', 'total_payment', 'caw_code', 'userdetails', 'getresit'));
     // }
 
-
     public function sahbayaronline(Request $request)
     {
         // dd($request->all());
@@ -291,13 +284,8 @@ class AccountController extends Controller
         $total_payment = 0;
 
         $senaraisag = $request->senarai_sag;
-        $user_notelbimbit = $request->notel_pembida;
         $user_namapembida = $request->nama_pembida;
 
-        $getkodcaw = Cawangan::where('caw_code', $request->kodcaw)->select('caw_name')->first();
-        $user_cawname = $getkodcaw->caw_name;
-
-
         if ($request->jenis_button == 'tidaksah') {
             // insert loguser
             $loguser = new LogUser;
@@ -313,10 +301,8 @@ class AccountController extends Controller
 
             return redirect()->route('home')->with('failed', 'Pembayaran Tidak Sah');
 
-
         } elseif ($request->jenis_button == 'sah') {
-            foreach(json_decode($senaraisag) as $sag)
+            foreach (json_decode($senaraisag) as $sag) {
-            {
                 $payment = Payment::where('id', $sag->payment_id)->first();
                 $payment->disahkan_oleh = $user->id;
                 $payment->disahkan_pada = $currentdate;
@@ -338,7 +324,6 @@ class AccountController extends Controller
                 $bidder->status_payment = 1;
                 $bidder->update();
             }
-            WhatsappPengesahanPembida::dispatch($user_notelbimbit,$user_namapembida,$user_cawname);
 
             // insert loguser
             $loguser = new LogUser;
@@ -350,7 +335,6 @@ class AccountController extends Controller
             $loguser->nota = $request->kodcaw.': '.$request->nama_pembida.' ('.$request->nokp_pembida.'): Bukti Bayaran Telah Sah';
             $loguser->save();
 
-            
             return redirect()->route('home')->with('success', 'Pembayaran Berjaya');
         }
 
@@ -402,11 +386,9 @@ class AccountController extends Controller
             )
             ->get();
 
-        foreach($senaraisag as $index1=>$sag)
+        foreach ($senaraisag as $index1 => $sag) {
-        {
 
-            if($sag)
+            if ($sag) {
-            {
                 // dd($sag);
                 $checking = Payment::join('lelongbid', 'payment.lelong_id', '=', 'lelongbid.lelong_id')
                     ->where('payment.id', $sag['payment_id'])
@@ -417,16 +399,13 @@ class AccountController extends Controller
                     ->whereNotNull('payment.disahkan_oleh')
                     ->first();
 
-                
                 $noresit = Resit::where('lelong_id', $lelong_id)
                     ->where('user_id', '=', $user_id)
                     ->first();
 
                 $senaraisag[$index1]['checking_payment'] = $checking;
                 // dd($checking);
-            }
+            } else {
-            else
-            {
                 //
             }
         }
@@ -455,8 +434,7 @@ class AccountController extends Controller
             ->get()->toArray();
 
         $array_resit = [];
-        foreach($getresit as $index1=>$resit)
+        foreach ($getresit as $index1 => $resit) {
-        {
             $getresit[$index1]['resit64'] = 'data:image/'.$resit['file_type'].';base64'.base64_encode($resit['filename']);
         }
 
@@ -524,7 +502,6 @@ class AccountController extends Controller
 
             $userdetails = User::where('id', $winner['user_id'])->first();
 
-            
             $SAGWin = Payment::join('lelongbidder', 'payment.id', '=', 'lelongbidder.payment_id')
                 ->where('payment.user_id', $winner['user_id'])
                 ->where('payment.kodcaw', $kodcaw)
@@ -559,7 +536,7 @@ class AccountController extends Controller
                 // dd($disahkanoleh);
             }
             $listwinner[$index1]['details'] = $userdetails;
-            $listwinner[$index1]['total_surat'] = sizeof($SAGWin);
+            $listwinner[$index1]['total_surat'] = count($SAGWin);
             $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
             $listwinner[$index1]['totalPay'] = $total_payment;
             $listwinner[$index1]['data'] = $SAGWin;
@@ -567,7 +544,6 @@ class AccountController extends Controller
 
         }
 
-
         return view('account.listbayaranonlinesah', compact('listwinner', 'lelong_id', 'getkodcaw', 'kodcaw'));
     }
 
@@ -618,11 +594,9 @@ class AccountController extends Controller
             )
             ->get();
 
-        foreach($senaraisag as $index1=>$sag)
+        foreach ($senaraisag as $index1 => $sag) {
-        {
 
-            if($sag)
+            if ($sag) {
-            {
                 // dd($sag);
                 $checking = Payment::join('lelongbid', 'payment.lelong_id', '=', 'lelongbid.lelong_id')
                     ->where('payment.id', $sag['payment_id'])
@@ -633,16 +607,13 @@ class AccountController extends Controller
                     ->whereNotNull('payment.disahkan_pada')
                     ->first();
 
-                
                 $noresit = Resit::where('lelong_id', $lelong_id)
                     ->where('user_id', '=', $user_id)
                     ->first();
 
                 $senaraisag[$index1]['checking_payment'] = $checking;
                 // dd($checking);
-            }
+            } else {
-            else
-            {
                 //
             }
         }
@@ -701,18 +672,19 @@ class AccountController extends Controller
         //     $lelongbid->filemarhun_id = $filemarhun->id;
         // }
 
-
         return view('account.sahsagcdm', compact('cawanganDetail', 'senaraisag', 'lelong_id', 'user_id', 'total_payment', 'caw_code', 'userdetails', 'fileresit'));
     }
 
     public function showPhotoResit(Request $request)
     {
         $resit = FileResit::where('id', '=', $request->fileresit_id)->first();
+
         // dd($this->resitPhotoService->show($request->user_id, $resit));
         return $this->resitPhotoService->show($request->user_id, $resit);
     }
 
-    public function laporanakaun (){
+    public function laporanakaun()
+    {
 
         $arraydetails = [];
 
@@ -725,9 +697,7 @@ class AccountController extends Controller
             ->toArray();
         // dd($laporan);
 
-
+        foreach ($laporan as $brg) {
-        foreach($laporan as $brg)
-        {
             $details = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('lelong_id', $brg['lelong_id'])
                 ->distinct()
@@ -737,12 +707,12 @@ class AccountController extends Controller
             array_push($arraydetails, ['brg' => $brg, 'detailsbrg' => $details]);
         }
 
-
         return view('account.laporanakaun', compact('arraydetails'));
 
     }
 
-    public function laporanakaundetail ($lelong_id, $kodcaw){
+    public function laporanakaundetail($lelong_id, $kodcaw)
+    {
 
         $lelonglel = Lelong::with('cawangan')->find($lelong_id);
 
@@ -770,23 +740,20 @@ class AccountController extends Controller
                 ->where('lelongbidder.status_bidder', 1)
                 ->where('lelongbid.lelong_id', $listing['lelong_id'])
                 ->get();
-            foreach($SAGWin as $index2=>$sag)
+            foreach ($SAGWin as $index2 => $sag) {
-            {
                 // dd($detailspayment);
                 $detailspayment = null;
-                if($sag['payment_id'] != null)
+                if ($sag['payment_id'] != null) {
-                {
                     $detailspayment = Payment::where('id', $sag['payment_id'])->first();
                     $total_payment = $total_payment + $detailspayment->total_payment;
                     // dd($total_payment);
-                }else
+                } else {
-                {
                     $total_payment = '0.00';
                 }
 
             }
             $listwinner[$index]['details'] = $userdetails;
-            $listwinner[$index]['total_surat'] = sizeof($SAGWin);
+            $listwinner[$index]['total_surat'] = count($SAGWin);
             $listwinner[$index]['totalBid'] = $SAGWin->sum('hargabida');
             $listwinner[$index]['totalPay'] = $total_payment;
             $listwinner[$index]['jenisbayaran'] = $detailspayment;
@@ -794,11 +761,11 @@ class AccountController extends Controller
 
         $getpengesahan = Cawangan::where('caw_code', $kodcaw)->first();
 
-
         return view('account.laporanakaundetail', compact('lelonglel', 'listwinner', 'lelong_id', 'getpengesahan', 'cawanganDetail'));
     }
 
-    public function laporanakaundetailexport (Request $request){
+    public function laporanakaundetailexport(Request $request)
+    {
 
         $lelong_id = $request->lelong_id;
         $kodcaw = $request->kodcaw;
@@ -828,23 +795,20 @@ class AccountController extends Controller
                 ->where('lelongbidder.status_bidder', 1)
                 ->where('lelongbid.lelong_id', $listing['lelong_id'])
                 ->get();
-            foreach($SAGWin as $index2=>$sag)
+            foreach ($SAGWin as $index2 => $sag) {
-            {
                 // dd($detailspayment);
                 $detailspayment = null;
-                if($sag['payment_id'] != null)
+                if ($sag['payment_id'] != null) {
-                {
                     $detailspayment = Payment::where('id', $sag['payment_id'])->first();
                     $total_payment = $total_payment + $detailspayment->total_payment;
                     // dd($total_payment);
-                }else
+                } else {
-                {
                     $total_payment = '0.00';
                 }
 
             }
             $listwinner[$index]['details'] = $userdetails;
-            $listwinner[$index]['total_surat'] = sizeof($SAGWin);
+            $listwinner[$index]['total_surat'] = count($SAGWin);
             $listwinner[$index]['totalBid'] = $SAGWin->sum('hargabida');
             $listwinner[$index]['totalPay'] = $total_payment;
             $listwinner[$index]['jenisbayaran'] = $detailspayment;
@@ -852,12 +816,10 @@ class AccountController extends Controller
 
         $getpengesahan = Cawangan::where('caw_code', $kodcaw)->first();
 
-        if($request->type == 'excel')
+        if ($request->type == 'excel') {
-        {
             return view('excel.laporanakaundetail_excel', compact('lelonglel', 'listwinner', 'lelong_id', 'getpengesahan', 'cawanganDetail'));
 
-        }else
+        } else {
-        {
             $pdf = PDF::loadView('pdf.laporanakaundetailpdf', compact('lelonglel', 'listwinner', 'lelong_id', 'getpengesahan', 'cawanganDetail'))
                 ->setPaper('a4', 'potrait');
 
@@ -866,8 +828,8 @@ class AccountController extends Controller
 
     }
 
-
+    public function laporanakaundetailall($lelong_id)
-     public function laporanakaundetailall ($lelong_id){
+    {
 
         $lelonglel = Lelong::with('cawangan')->find($lelong_id);
 
@@ -898,24 +860,21 @@ class AccountController extends Controller
                 ->get();
             $cawanganDetail = Cawangan::where('caw_code', $listing['kodcaw'])->first();
 
-            foreach($SAGWin as $index2=>$sag)
+            foreach ($SAGWin as $index2 => $sag) {
-            {
                 // dd($detailspayment);
                 $detailspayment = null;
-                if($sag['payment_id'] != null)
+                if ($sag['payment_id'] != null) {
-                {
                     $detailspayment = Payment::where('id', $sag['payment_id'])->first();
                     // dd($detailspayment);
                     $total_payment = $total_payment + $detailspayment->total_payment;
                     // dd($total_payment);
-                }else
+                } else {
-                {
                     $total_payment = '0.00';
                 }
 
             }
             $listwinner[$index]['details'] = $userdetails;
-            $listwinner[$index]['total_surat'] = sizeof($SAGWin);
+            $listwinner[$index]['total_surat'] = count($SAGWin);
             $listwinner[$index]['totalBid'] = $SAGWin->sum('hargabida');
             $listwinner[$index]['totalPay'] = $total_payment;
             $listwinner[$index]['jenisbayaran'] = $detailspayment;
@@ -924,10 +883,11 @@ class AccountController extends Controller
 
         $getpengesahan = Cawangan::first();
 
-
         return view('account.laporanakaundetailall', compact('lelonglel', 'listwinner', 'lelong_id', 'getpengesahan', 'cawanganDetail'));
     }
-    public function laporanakaundetailallexport(Request $request){
+
+    public function laporanakaundetailallexport(Request $request)
+    {
 
         $lelong_id = $request->lelong_id;
         $kodcaw = $request->kodcaw;
@@ -958,23 +918,20 @@ class AccountController extends Controller
                 ->where('lelongbid.lelong_id', $listing['lelong_id'])
                 ->get();
             $cawanganDetail = Cawangan::where('caw_code', $listing['kodcaw'])->first();
-            foreach($SAGWin as $index2=>$sag)
+            foreach ($SAGWin as $index2 => $sag) {
-            {
                 // dd($detailspayment);
                 $detailspayment = null;
-                if($sag['payment_id'] != null)
+                if ($sag['payment_id'] != null) {
-                {
                     $detailspayment = Payment::where('id', $sag['payment_id'])->first();
                     $total_payment = $total_payment + $detailspayment->total_payment;
                     // dd($total_payment);
-                }else
+                } else {
-                {
                     $total_payment = '0.00';
                 }
 
             }
             $listwinner[$index]['details'] = $userdetails;
-            $listwinner[$index]['total_surat'] = sizeof($SAGWin);
+            $listwinner[$index]['total_surat'] = count($SAGWin);
             $listwinner[$index]['totalBid'] = $SAGWin->sum('hargabida');
             $listwinner[$index]['totalPay'] = $total_payment;
             $listwinner[$index]['jenisbayaran'] = $detailspayment;
@@ -983,12 +940,10 @@ class AccountController extends Controller
 
         $getpengesahan = Cawangan::where('caw_code', $kodcaw)->first();
 
-        if($request->type == 'excel')
+        if ($request->type == 'excel') {
-        {
             return view('excel.laporanakaundetailall_excel', compact('lelonglel', 'listwinner', 'lelong_id', 'getpengesahan', 'cawanganDetail'));
 
-        }else
+        } else {
-        {
             $pdf = PDF::loadView('pdf.laporanakaundetailallpdf', compact('lelonglel', 'listwinner', 'lelong_id', 'getpengesahan', 'cawanganDetail'))
                 ->setPaper('a4', 'potrait');
 
@@ -996,6 +951,4 @@ class AccountController extends Controller
         }
 
     }
-    
-
 }

app/Http/Controllers/ApiController.php

@@ -3,44 +3,22 @@
 namespace App\Http\Controllers;
 
 use App\Events\PaymentNotify;
-
-use Illuminate\Http\Request;
-use Spatie\Permission\Models\Role;
-use Spatie\Permission\Models\Permission;
-use Illuminate\Support\Facades\Auth;
-use App\Models\User;
-use PDF;
-use App\Models\Cawangan;
 use App\Models\JenisEmas;
 use App\Models\JenisKarat;
-
-use App\Models\Simulasi;
-use App\Models\SimulasiBid;
-use App\Models\SimulasiBidMarhun;
-use App\Models\SimKarat;
-use App\Models\SimKarat_temp;
-use App\Models\CawanganSimulasi;
-
-
 use App\Models\Lelong;
-use App\Models\CawanganLelong;
 use App\Models\LelongBid;
-use App\Models\LelongBidMarhun;
-use App\Models\LelKarat;
-use App\Models\LelKarat_temp;
 use App\Models\LelongBidder;
-use App\Models\Resit;
-use App\Models\Payment;
-
-use Session;
-use Carbon\Carbon;
-use Money\Money;
-use Billplz\Client;
-use Http\Client\Common\HttpMethodsClient;
-use Http\Adapter\Guzzle7\Client as GuzzleHttpClient;
-use Http\Message\MessageFactory\GuzzleMessageFactory;
 use App\Models\LogUser;
-use App\Jobs\WhatsappPembidaFPXPaid;
+use App\Models\Payment;
+use App\Models\Resit;
+use App\Models\User;
+use Billplz\Client;
+use Carbon\Carbon;
+use Http\Adapter\Guzzle7\Client as GuzzleHttpClient;
+use Http\Client\Common\HttpMethodsClient;
+use Http\Message\MessageFactory\GuzzleMessageFactory;
+use Illuminate\Http\Request;
+use Money\Money;
 
 class ApiController extends Controller
 {
@@ -55,16 +33,17 @@ class ApiController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function __construct(){
+    public function __construct()
+    {
         // parent::__construct();
         if (config('app.env') != 'production') {
+            $this->api_key = 'abecfd0c-98d8-4635-abc2-2fcba8c60c11';
+            $this->XSignature_Key = 'S-GWr7z03XjAhqPsFfu_H5nQ';
+            $this->collection_id = 'bwdtejv0';
+        } else {
             $this->api_key = 'f3e82fe1-a422-4660-97f0-65cc59ff6c47';
             $this->XSignature_Key = 'S-alZUbzmD2_TF3vmrRqgehQ';
-			$this->collection_id = 'do6x2mhg';
+            $this->collection_id = 'lx_bplsb';
-		}else{
-			$this->api_key = 'f4e099e5-88ca-4712-a01e-b7e1daf78ce2';
-			$this->XSignature_Key =  'S-OApBh3DIwelPcWPzlMLMeg';
-                        $this->collection_id = 'do6x2mhg';
         }
 
     }
@@ -77,8 +56,7 @@ class ApiController extends Controller
         $lelong = Lelong::where('tarikh_lelong', '=', $currentdate)->get();
 
         $arrayID = [];
-        foreach($lelong as $data)
+        foreach ($lelong as $data) {
-        {
             array_push($arrayID, $data->id);
         }
         $lelongbid = LelongBid::whereIn('lelong_id', $arrayID)
@@ -87,17 +65,14 @@ class ApiController extends Controller
 
         $surat = LelongBid::whereIn('lelong_id', $arrayID)->get();
 
-        if(sizeof($lelongbid)!=0)
+        if (count($lelongbid) != 0) {
-        {
             return response()->json([
                 'success' => true,
                 'lelong' => $lelong,
                 'surat' => $surat,
-                'item' => $lelongbid
+                'item' => $lelongbid,
             ]);
-        }
+        } else {
-        else
-        {
             return response()->json([
                 'success' => false,
                 'message' => 'No Data',
@@ -111,17 +86,13 @@ class ApiController extends Controller
         $jenisemas = JenisEmas::all();
         $jeniskarat = JenisKarat::all();
 
-
+        if (count($jenisemas) != 0 && count($jeniskarat) != 0) {
-        if(sizeof($jenisemas)!=0 && sizeof($jeniskarat)!=0 )
-        {
             return response()->json([
                 'success' => true,
                 'karat' => $jeniskarat,
-                'emas' => $jenisemas
+                'emas' => $jenisemas,
             ]);
-        }
+        } else {
-        else
-        {
             return response()->json([
                 'success' => false,
                 'message' => 'No Data',
@@ -133,14 +104,15 @@ class ApiController extends Controller
     {
         return view('pembayaran.testbillplz');
     }
+
     public function feepayment(Request $request)
     {
 
-        $arraycollection_id = array();
+        $arraycollection_id = [];
 
         $http = new HttpMethodsClient(
-			new GuzzleHttpClient(),
+            new GuzzleHttpClient,
-			new GuzzleMessageFactory()
+            new GuzzleMessageFactory
         );
 
         $billplz = new Client($http, $this->api_key);
@@ -153,7 +125,7 @@ class ApiController extends Controller
         $bill = $billplz->bill();
 
         $current = Carbon::now();
-        $current = new Carbon();
+        $current = new Carbon;
 
         $day = $current->day;
         $month = $current->month;
@@ -185,7 +157,7 @@ class ApiController extends Controller
         // dd($billcode);
         // $billcode['redirect_url'] = 'http://192.168.0.10:8003/api/pembayaran/response';
         // dd($billcode);
-        $reference_no = 'LPKB' . $day . $month . $year . sprintf("%08d", $nosiri);
+        $reference_no = 'LPKB'.$day.$month.$year.sprintf('%08d', $nosiri);
         // $response2 = $bill->get($billcode['id']);
         // dd($response2->toArray());
         $resit = new Resit;
@@ -197,7 +169,6 @@ class ApiController extends Controller
         $resit->total_payment = 10;
         $resit->save();
 
-
         // return redirect($billcode['url'] . '?auto_submit=true');
         return response()->json([
             'success' => true,
@@ -207,11 +178,12 @@ class ApiController extends Controller
         // return view('pembayaran.result.berjaya',compact('arraybayaran'));
     }
 
-    public function callback(Request $request){
+    public function callback(Request $request)
+    {
         // dd('hye callback');
         $http = new HttpMethodsClient(
-			new GuzzleHttpClient(),
+            new GuzzleHttpClient,
-			new GuzzleMessageFactory()
+            new GuzzleMessageFactory
         );
 
         $billplz = new Client($http, $this->api_key);
@@ -264,6 +236,7 @@ class ApiController extends Controller
             $success = false;
 
             event(new PaymentNotify('UNSUCCESSFUL', $resit->user_id, ''));
+
             // return response()->json([
             //     'success' => false,
             //     'resit' => $resit
@@ -272,11 +245,12 @@ class ApiController extends Controller
         }
     }
 
-    public function response(Request $request){
+    public function response(Request $request)
+    {
         // dd('hye response');
         $http = new HttpMethodsClient(
-			new GuzzleHttpClient(),
+            new GuzzleHttpClient,
-			new GuzzleMessageFactory()
+            new GuzzleMessageFactory
         );
 
         $billplz = new Client($http, $this->api_key);
@@ -332,6 +306,7 @@ class ApiController extends Controller
             $success = false;
 
             event(new PaymentNotify('UNSUCCESSFUL', $resit->user_id, ''));
+
             // return response()->json([
             //     'success' => false,
             //     'resit' => $resit
@@ -342,11 +317,11 @@ class ApiController extends Controller
 
     public function bidpayment(Request $request)
     {
-        $arraycollection_id = array();
+        $arraycollection_id = [];
 
         $http = new HttpMethodsClient(
-			new GuzzleHttpClient(),
+            new GuzzleHttpClient,
-			new GuzzleMessageFactory()
+            new GuzzleMessageFactory
         );
 
         $billplz = new Client($http, $this->api_key);
@@ -359,7 +334,7 @@ class ApiController extends Controller
         $bill = $billplz->bill();
 
         $current = Carbon::now();
-        $current = new Carbon();
+        $current = new Carbon;
 
         $day = $current->day;
         $month = $current->month;
@@ -392,7 +367,7 @@ class ApiController extends Controller
         // dd($billcode);
         // $billcode['redirect_url'] = 'http://192.168.0.10:8003/api/pembayaran/response';
         // dd($billcode);
-        $reference_no = 'LPKB' . $day . $month . $year . sprintf("%08d", $nosiri);
+        $reference_no = 'LPKB'.$day.$month.$year.sprintf('%08d', $nosiri);
         // $response2 = $bill->get($billcode['id']);
         // dd($response2->toArray());
 
@@ -426,7 +401,6 @@ class ApiController extends Controller
             $payment->save();
         }
 
-
         // return redirect($billcode['url'] . '?auto_submit=true');
         return response()->json([
             'success' => true,
@@ -439,8 +413,8 @@ class ApiController extends Controller
     {
         // dd('hye callback');
         $http = new HttpMethodsClient(
-            new GuzzleHttpClient(),
+            new GuzzleHttpClient,
-            new GuzzleMessageFactory()
+            new GuzzleMessageFactory
         );
 
         $billplz = new Client($http, $this->api_key);
@@ -483,7 +457,7 @@ class ApiController extends Controller
                 ->get();
             foreach ($payment as $index) {
                 $index->status = 2; // 0-unpaid //1-fee //2-bid
-                $index->remark = "BERJAYA BAYARAN ONLINE";
+                $index->remark = 'BERJAYA BAYARAN ONLINE';
                 $index->update();
 
                 // $updateTag = LelongBid::where('lelongbid.norujukan', $index->norujukan)->first();
@@ -543,8 +517,8 @@ class ApiController extends Controller
     {
         // dd($request->all());
         $http = new HttpMethodsClient(
-            new GuzzleHttpClient(),
+            new GuzzleHttpClient,
-            new GuzzleMessageFactory()
+            new GuzzleMessageFactory
         );
 
         $billplz = new Client($http, $this->api_key);
@@ -588,7 +562,7 @@ class ApiController extends Controller
 
             foreach ($payment as $index) {
                 $index->status = 2; // 0-unpaid //1-fee //2-bid
-                $index->remark = "BERJAYA BAYARAN ONLINE";
+                $index->remark = 'BERJAYA BAYARAN ONLINE';
                 $index->update();
 
                 // $updateTag = LelongBid::where('lelongbid.norujukan', $index->norujukan)->first();
@@ -647,7 +621,6 @@ class ApiController extends Controller
         }
     }
 
-
     // BillplzService.php atau ApiController.php
     public function processPaidResit(array $data)
     {
@@ -684,7 +657,7 @@ class ApiController extends Controller
 
         foreach ($payment as $index) {
             $index->status = 2;
-            $index->remark = "BERJAYA BAYARAN ONLINE";
+            $index->remark = 'BERJAYA BAYARAN ONLINE';
             $index->update();
 
             $updateTagBid = LelongBid::where('norujukan', $index->norujukan)->first();
@@ -703,13 +676,7 @@ class ApiController extends Controller
         }
 
         event(new PaymentNotify('PAID', $resit->user_id, $payment));
-        //notifikasi wasap kepada pembida//
-        WhatsappPembidaFPXPaid::dispatch($resit->user_id,
-        $resit->id,
-        $resit->total_payment);
 
         return true;
     }
-
 }
-       

app/Http/Controllers/Auth/LoginController.php

@@ -3,8 +3,10 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
+use App\Models\User;
 use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Http\Request;
 
 class LoginController extends Controller
 {
@@ -38,6 +40,13 @@ class LoginController extends Controller
         $this->middleware('guest')->except('logout');
     }
 
+    protected function credentials(\Illuminate\Http\Request $request)
+    {
+        return array_merge($request->only($this->username(), 'password'), [
+            'status' => 'active',
+        ]);
+    }
+
     public function username()
     {
         return 'username';
@@ -47,4 +56,27 @@ class LoginController extends Controller
     {
         return redirect()->route('login');
     }
+
+    /**
+     * In local env, accept any password for an existing username.
+     */
+    protected function attemptLogin(Request $request)
+    {
+        if (app()->environment('local')) {
+            $user = User::where($this->username(), $request->input($this->username()))->first();
+
+            if ($user) {
+                $this->guard()->login($user, $request->filled('remember'));
+
+                return true;
+            }
+
+            return false;
+        }
+
+        return $this->guard()->attempt(
+            $this->credentials($request),
+            $request->filled('remember')
+        );
+    }
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -3,8 +3,8 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use App\Providers\RouteServiceProvider;
 use App\Models\User;
+use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
@@ -44,7 +44,6 @@ class RegisterController extends Controller
     /**
      * Get a validator for an incoming registration request.
      *
-     * @param  array  $data
      * @return \Illuminate\Contracts\Validation\Validator
      */
     protected function validator(array $data)
@@ -59,7 +58,6 @@ class RegisterController extends Controller
     /**
      * Create a new user instance after a valid registration.
      *
-     * @param  array  $data
      * @return \App\Models\User
      */
     protected function create(array $data)

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -3,9 +3,9 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
+use App\Models\User;
 use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\ResetsPasswords;
-use App\Models\User;
 
 class ResetPasswordController extends Controller
 {

app/Http/Controllers/AuthMobile/AuthController.php

@@ -2,22 +2,23 @@
 
 namespace App\Http\Controllers\AuthMobile;
 
-use Illuminate\Support\Facades\Auth;
-use Carbon\Carbon;
-use App\Models\User;
-use App\Models\File;
 use App\Http\Controllers\Controller;
+use App\Mail\ResetPassword;
+use App\Mail\VerifyEmail;
 use App\Models\Staff;
+use App\Models\User;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
-use Illuminate\Support\Facades\Mail;
-use App\Mail\ResetPassword;
 
 class AuthController extends Controller
 {
-    public function register(Request $request) {
+    public function register(Request $request)
+    {
         // dd($request->all);
         $validator = Validator::make($request->all(), [
             'name' => 'required|string',
@@ -27,14 +28,15 @@ class AuthController extends Controller
             'email' => 'required|string|unique:users|email',
             'notelbimbit' => 'required|string|unique:users',
             'register_agree' => 'required|integer',
-            'alamat' => 'required'
+            'alamat' => 'required',
         ]);
 
         if ($validator->fails()) {
             $errors = [
                 'success' => false,
-                'message' => $validator->errors()
+                'message' => $validator->errors(),
             ];
+
             return response($errors, 201);
         }
         // Retrieve the validated input...
@@ -44,19 +46,19 @@ class AuthController extends Controller
         $check_staff = Staff::where('nokp', '=', $convert_ic_to_hyphen)
             ->orWhere('nokp', '=', $fields['nokp'])
             ->first();
-        if($check_staff)
+        if ($check_staff) {
-        {
             $errors = [
-                'success' => "Staff",
+                'success' => 'Staff',
-                'message' => "Staff tidak dibenarkan mendaftar."
+                'message' => 'Staff tidak dibenarkan mendaftar.',
             ];
+
             return response($errors, 201);
 
         }
 
         $currentdate = Carbon::now();
         $currentdate = $currentdate->toDateTimeString();
-        
+        $verificationToken = Str::random(60);
         $user = new User;
         $user->name = $fields['name'];
         $user->username = $fields['username'];
@@ -69,101 +71,134 @@ class AuthController extends Controller
         $user->status = 'active';
         $user->user_type = 2; // type 2 = pembida
         $user->alamat = $fields['alamat'];
+        $user->token = $verificationToken;
+        $user->is_verified = 0;
+        $user->email_verified_at = null;
         $user->save();
 
-        // if($user->save())
+        $verifyUrl = url('/api/verifyEmail').'?'.http_build_query([
-        // {
+            'email' => $user->email,
-        //     $images = $request->images;
+            'token' => $verificationToken,
-        //     foreach($images as $img)
+        ]);
-        //     {
-        //         $file = new File;
-        //         $file->user_id = $user->id;
-        //         $file->file_type = $img['file_type'];
-        //         $file->filename = $img['filename'];
-        //         $file->save();
 
-        //     }
+        Mail::to($user->email)->send(new VerifyEmail($user->name, $verifyUrl));
 
-            
-        // }
-        
-        $token = $user->createToken('myapptoken')->plainTextToken;
         $response = [
             'success' => true,
+            'message' => 'Pendaftaran berjaya. Sila semak emel anda untuk pautan pengesahan.',
             'user' => $user,
-            'token' => $token
         ];
 
         return response($response, 201);
     }
 
+    public function verifyEmail(Request $request)
+    {
+        $redirectBase = rtrim(config('app.app_pembida'), '/');
+
+        $validator = Validator::make($request->all(), [
+            'email' => 'required|email',
+            'token' => 'required|string',
+        ]);
+
+        if ($validator->fails()) {
+            return redirect()->away($redirectBase.'?email_verified=0&message='.urlencode('Pautan pengesahan tidak sah.'));
+        }
+
+        $user = User::where('email', $request->email)
+            ->where('token', $request->token)
+            ->where('is_verified', 0)
+            ->first();
+
+        if (! $user) {
+            return redirect()->away($redirectBase.'?email_verified=0&message='.urlencode('Pautan pengesahan tidak sah atau emel telah disahkan.'));
+        }
+
+        $user->is_verified = 1;
+        $user->email_verified_at = Carbon::now();
+        $user->token = null;
+        $user->save();
+
+        return redirect()->away($redirectBase.'?email_verified=1&message='.urlencode('Emel berjaya disahkan.'));
+    }
+
     public function loginUser(Request $request)
     {
         $fields = $request->validate([
             'username' => 'required|string',
-            'password' => 'required|string'
+            'password' => 'required|string',
         ]);
 
         $user = User::where('username', $fields['username'])->orWhere('email', $fields['username'])->first();
 
         if ($user) {
 
-            $passwordTrue = Hash::check($fields['password'], $user->password);
+            $passwordTrue = app()->environment('local')
+                || Hash::check($fields['password'], $user->password);
 
             if ($passwordTrue) {
 
                 if ($user->user_type != '2') {
                     return response([
                         'statusAkaun' => 6,
-                        'message1' => "Akaun ini didaftar menggunakan id staff.",
+                        'message1' => 'Akaun ini didaftar menggunakan id staff.',
-                        'message2' => "Sila login menggunakan url " . env('APP_URL'),
+                        'message2' => 'Sila login menggunakan url '.env('APP_URL'),
                     ]);
                 } else {
-                    if ($user->status == 'active') {
+                    if (is_null($user->email_verified_at)) {
+                        return response([
+                            'statusAkaun' => 7,
+                            'message' => 'Sila sahkan emel anda sebelum log masuk. Semak peti masuk anda untuk pautan pengesahan.',
+                        ]);
+                    } elseif ($user->status == 'active') {
+                        $user->tokens()->delete();
                         $token = $user->createToken('myapptoken')->plainTextToken;
+
                         return response([
                             'statusAkaun' => 1,
                             'user' => $user,
-                            'token' => $token
+                            'token' => $token,
                         ]);
                     } elseif ($user->status == 'banned') {
                         return response()->json([
                             'statusAkaun' => 2,
-                            'message' => "User banned."
+                            'message' => 'User banned.',
                         ]);
                     } elseif ($user->status == 'rejected') {
                         return response([
                             'statusAkaun' => 3,
-                            'message' => "Rejected."
+                            'message' => 'Rejected.',
                         ]);
                     } else {
                         return response([
                             'statusAkaun' => 4,
-                            'message' => 'Registration in progress,status wait for approval.'
+                            'message' => 'Registration in progress,status wait for approval.',
                         ]);
                     }
                 }
             } else {
                 return response()->json([
                     'statusAkaun' => 5,
-                    'message' => "Kata Laluan Salah."
+                    'message' => 'Kata Laluan Salah.',
                 ]);
             }
         } else {
             return response()->json([
                 'statusAkaun' => 0,
-                'message' => "Akaun tiada."
+                'message' => 'Akaun tiada.',
             ]);
         }
     }
 
-    public function logoutUser(Request $request){
+    public function logoutUser(Request $request)
-        auth()->user()->currentAccessToken()->delete();
+    {
-
+        $user = $request->user();
-        return [
+        $token = $user ? $user->currentAccessToken() : null;
-            'message' => 'Logged Out'
+        if ($token) {
-        ];
+            $token->delete();
+        }
 
+        return response()->json(['message' => 'Logged Out']);
     }
 
     public function forgotPassword(Request $request)
@@ -173,7 +208,7 @@ class AuthController extends Controller
             return response()->json([
                 'success' => false,
                 'status' => 0,
-                'message' => "Emel tidak dijumpai. Sila daftar sekarang."
+                'message' => 'Emel tidak dijumpai. Sila daftar sekarang.',
             ]);
         }
 
@@ -183,27 +218,84 @@ class AuthController extends Controller
         $user['is_verified'] = 0;
         $user->save();
 
-        Mail::to($request->email)->send(new ResetPassword($user->name, $token));
+        $resetUrl = rtrim(config('app.app_pembida'), '/').'/reset-password/'.$token;
+
+        Mail::to($request->email)->send(new ResetPassword($user->name, $resetUrl));
 
         if (Mail::failures() != 0) {
             return response()->json([
                 'success' => true,
-                'message' => "Berjaya DiHantar! Pautan Lupa Katalaluan Telah Dihantarkan Kepada Alamat Emel Anda."
+                'message' => 'Berjaya DiHantar! Pautan Lupa Katalaluan Telah Dihantarkan Kepada Alamat Emel Anda.',
             ]);
         }
+
         return response()->json([
             'success' => false,
             'status' => 500,
-            'message' => "Failed! there is some issue with email provider"
+            'message' => 'Failed! there is some issue with email provider',
+        ]);
+    }
+
+    public function validateResetToken($token)
+    {
+        $user = User::where('token', $token)->where('is_verified', 0)->first();
+
+        if (! $user) {
+            return response()->json([
+                'success' => false,
+                'message' => 'Pautan tetapan semula kata laluan tidak sah atau telah tamat tempoh.',
+            ], 422);
+        }
+
+        return response()->json([
+            'success' => true,
+            'email' => $user->email,
+        ]);
+    }
+
+    public function updatePassword(Request $request)
+    {
+        $validator = Validator::make($request->all(), [
+            'token' => 'required|string',
+            'password' => 'required|string|min:6',
+            'confirm_password' => 'required|same:password',
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json([
+                'success' => false,
+                'message' => $validator->errors()->first(),
+                'errors' => $validator->errors(),
+            ], 422);
+        }
+
+        $user = User::where('token', $request->token)->where('is_verified', 0)->first();
+
+        if (! $user) {
+            return response()->json([
+                'success' => false,
+                'message' => 'Pautan tetapan semula kata laluan tidak sah atau telah tamat tempoh.',
+            ], 422);
+        }
+
+        $user->password = Hash::make($request->password);
+        $user->token = null;
+        $user->is_verified = 0;
+        $user->save();
+
+        return response()->json([
+            'success' => true,
+            'message' => 'Katalaluan anda telah berjaya dikemaskini.',
         ]);
     }
 
     public function getProfile()
     {
         $user = Auth::user();
+
         return response()->json([
-            "message" => true,
+            'message' => true,
-            "user_detail" => $user
+            'user_detail' => $user,
         ]);
     }
 }

app/Http/Controllers/AuthMobile/ForgotPasswordController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\ResetsPasswords;
 
 class ResetPasswordController extends Controller
 {

app/Http/Controllers/AuthMobile/ResetPasswordController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\AuthMobile;
 
 use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
 
 class ResetPasswordController extends Controller
 {

app/Http/Controllers/CartController.php

@@ -2,25 +2,12 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
+use App\Models\Cart;
-use Spatie\Permission\Models\Role;
-use Spatie\Permission\Models\Permission;
-use Illuminate\Support\Facades\Auth;
-use App\Models\User;
-use PDF;
 use App\Models\Cawangan;
-use App\Models\JenisEmas;
+use App\Models\FileMarhun;
-use App\Models\JenisKarat;
-
-use App\Models\Lelong;
-use App\Models\CawanganLelong;
 use App\Models\LelongBid;
 use App\Models\LelongBidMarhun;
-use App\Models\LelKarat;
+use Illuminate\Http\Request;
-use App\Models\Cart;
-use Carbon\Carbon;
-use App\Models\FileMarhun;
-
 
 class CartController extends Controller
 {
@@ -35,13 +22,11 @@ class CartController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-
     public function getCart($userid)
     {
         $carts = Cart::where('user_id', '=', $userid)->get()->toArray();
 
-       foreach($carts as $index => $cart)
+        foreach ($carts as $index => $cart) {
-       {
             $lelongbid = LelongBid::where('id', $cart['lelongbid_id'])->first()->toArray();
             $marhun = LelongBidMarhun::where('lelongbid_id', '=', $lelongbid['id'])->get()->toArray();
             $cawangan = Cawangan::where('id', '=', $lelongbid['caw_id'])->first()->toArray();
@@ -52,7 +37,7 @@ class CartController extends Controller
         }
 
         return response()->json([
-            "carts" => $carts
+            'carts' => $carts,
         ]);
     }
 
@@ -104,7 +89,6 @@ class CartController extends Controller
             $master_total_bidaan += $total_hargabida;
         }
 
-
         if ($groupCawangan) {
             return response()->json([
                 'success' => true,
@@ -115,7 +99,7 @@ class CartController extends Controller
         } else {
             return response()->json([
                 'success' => false,
-                'message' => 'Empty Data'
+                'message' => 'Empty Data',
             ], 201);
         }
     }
@@ -130,7 +114,7 @@ class CartController extends Controller
             return response()->json([
                 'success' => 'gagal',
                 'status' => 9,
-                'message' => 'Harga bida kurang daripada harga asas.'
+                'message' => 'Harga bida kurang daripada harga asas.',
             ]);
         }
 
@@ -139,7 +123,7 @@ class CartController extends Controller
             return response()->json([
                 'success' => 'gagal_tambah_ke_troli',
                 'status' => 8,
-                'message' => 'SAG telah berada di dalam troli!'
+                'message' => 'SAG telah berada di dalam troli!',
             ]);
         }
 
@@ -148,15 +132,12 @@ class CartController extends Controller
         $item->lelongbid_id = $request->lelongbid_id;
         $item->hargabida = $request->hargabida;
 
-        if($item->save())
+        if ($item->save()) {
-        {
             return response()->json([
                 'success' => true,
-                'carts' => $item
+                'carts' => $item,
             ]);
-        }
+        } else {
-        else
-        {
             return response()->json([
                 'success' => false,
                 'message' => 'Error! Cannot save.',
@@ -167,15 +148,12 @@ class CartController extends Controller
     public function removeFromCart(Request $request)
     {
         $item = Cart::where('id', $request->cart_id)->first();
-        if($item->delete())
+        if ($item->delete()) {
-        {
             return response()->json([
                 'success' => true,
-                'carts' => $item
+                'carts' => $item,
             ]);
-        }
+        } else {
-        else
-        {
             return response()->json([
                 'success' => false,
                 'message' => 'Error! Cannot save.',
@@ -197,7 +175,7 @@ class CartController extends Controller
             return response()->json([
                 'success' => 'gagal',
                 'status' => 9,
-                'message' => 'Harga bida kurang daripada harga asas.'
+                'message' => 'Harga bida kurang daripada harga asas.',
             ]);
         }
 
@@ -205,7 +183,7 @@ class CartController extends Controller
         if ($cart->save()) {
             return response()->json([
                 'success' => true,
-                'cart' => $cart
+                'cart' => $cart,
             ]);
         } else {
             return response()->json([
@@ -218,15 +196,12 @@ class CartController extends Controller
     public function deleteCart($id)
     {
         $cart = Cart::where('id', '=', $id)->first();
-        if($cart->delete())
+        if ($cart->delete()) {
-        {
             return response()->json([
                 'success' => true,
-                'message' => 'Delete Success'
+                'message' => 'Delete Success',
             ]);
-        }
+        } else {
-        else
-        {
             return response()->json([
                 'success' => false,
                 'message' => 'Error! Cannot save.',
@@ -242,7 +217,7 @@ class CartController extends Controller
         if ($cart->delete()) {
             return response()->json([
                 'success' => true,
-                'message' => 'Delete Success'
+                'message' => 'Delete Success',
             ]);
         } else {
             return response()->json([
@@ -251,7 +226,4 @@ class CartController extends Controller
             ], 401);
         }
     }
-
-    
 }
-       

app/Http/Controllers/DatabaseController.php

@@ -2,16 +2,14 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use Spatie\Permission\Models\Role;
-use Spatie\Permission\Models\Permission;
-use Illuminate\Support\Facades\Auth;
 use App\Models\Cawangan;
 use App\Models\Gadai;
 use App\Models\TransaksiKeuntungan;
+use Exception;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Storage;
-use Exception;
+use Spatie\Permission\Models\Role;
 
 class DatabaseController extends Controller
 {
@@ -74,6 +72,7 @@ class DatabaseController extends Controller
             'lokasi' => $request->lokasi,
             'pkb_jmc' => $request->pkb_jmc,
         ]);
+
         return redirect()->route('sistem.database')
             ->with('success', 'Data berjaya disimpan');
     }
@@ -99,7 +98,6 @@ class DatabaseController extends Controller
         $caw->pkb_jmc = $request->pkb_jmc;
         $caw->save();
 
-
         return redirect()->route('sistem.database')
             ->with('success', 'Data berjaya disimpan');
     }
@@ -113,12 +111,10 @@ class DatabaseController extends Controller
             ->with('success', 'Data berjaya dipadam');
     }
 
-    public function export() 
+    public function export() {}
+
+    public function yuranBidaan()
     {
-
-    }
-
-    public function yuranBidaan() {
         // dd("hye");
         return view('pengurusandatabase.yuranbidaan');
 

app/Http/Controllers/HomeController.php

@@ -2,25 +2,19 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use Spatie\Permission\Models\Role;
-use Spatie\Permission\Models\Permission;
-use Illuminate\Support\Facades\Auth;
-
-
-use App\Models\Lelong;
-use App\Models\CawanganLelong;
-use App\Models\Pengesahan;
-use Carbon\Carbon;
 use App\Models\Cawangan;
+use App\Models\CawanganLelong;
 use App\Models\Job;
+use App\Models\Lelong;
 use App\Models\LelongBid;
-use App\Models\Payment;
-use App\Models\User;
 use App\Models\LelongBidder;
-use Hash;
+use App\Models\Payment;
+use App\Models\Pengesahan;
+use App\Models\User;
 use DateTime;
-use App\Jobs\AutoTamatLelong;
+use Hash;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
 class HomeController extends Controller
 {
@@ -82,8 +76,7 @@ class HomeController extends Controller
             ->get()->toArray();
         // dd($lelong);
 
-        foreach($lelong as $info)
+        foreach ($lelong as $info) {
-        {
 
             $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->select('batchlel', 'lelong_id', 'cawangan_lelong.caw_id', 'cawangan.caw_name', 'cawangan.caw_code', 'status_online', 'cawangan_lelong.masamula_lelong', 'cawangan_lelong.masatamat_lelong')
@@ -91,8 +84,7 @@ class HomeController extends Controller
                 ->get()
                 ->toArray();
 
-            foreach($detailsinfo as $det)
+            foreach ($detailsinfo as $det) {
-            {
 
                 $cawsemak = LelongBid::where('status_semak', 0)
                     ->where('lelong_id', $det['lelong_id'])
@@ -103,11 +95,9 @@ class HomeController extends Controller
                 array_push($semakCountArray, $semakCount);
             }
 
-
             array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo]);
             // dd($arrayinfo);
 
-
         }// dd($detailsinfo);
         $arrayinfomutu = [];
         // HOME KELULUSAN MUTU MARHUN
@@ -116,7 +106,7 @@ class HomeController extends Controller
         // ->where('sts_lelong', 0)
             ->where('lelongbid.kodcaw', $user->kodcaw)
             ->whereIn('pengesahan.status_ubah', [1, 2, 3, 4, 5, 7, 8, 9, 10])
-        ->where('disahkan_oleh','=', NULL)
+            ->where('disahkan_oleh', '=', null)
             ->select('pengesahan.lelong_id', 'lelong.id', 'lelong.tarikh_lelong', 'lelong.masatamat_lelong', 'lelong.harga_emas_asas', 'lelong.jbg', 'lelong.cajlelong', 'sts_lelong')
         // ->groupBy('pengesahan.lelong_id')
             ->distinct()
@@ -124,10 +114,7 @@ class HomeController extends Controller
             ->toArray();
         // dd($lelong);
 
-        
+        foreach ($lelongmutu as $infomutu) {
- 
-        foreach($lelongmutu as $infomutu)
-        {
             $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('cawangan.caw_code', $user->kodcaw)
                 ->where('lelong_id', $infomutu['lelong_id'])
@@ -142,7 +129,7 @@ class HomeController extends Controller
             $data->tarikh_lelong = $data->tarikh_lelong->format('d-m-Y');
         }
 
-        if ($caw <> NULL) { //staf cwgn
+        if ($caw != null) { // staf cwgn
             $sag = LelongBid::where('status_semak', 0) // belum disemak
                 ->where('kodcaw', $caw['caw_code'])
                 ->get();
@@ -150,12 +137,12 @@ class HomeController extends Controller
             $sag_by_lelong_id = $sag->groupBy('lelong_id');
 
             foreach ($sag_by_lelong_id as $index => $lelong) {
-                if ($all_lelong[$index]); {
+                if ($all_lelong[$index]);
                 $all_lelong[$index]['sag_belum_semak'] = $lelong->count();
-                }
+
             }
 
-        } else { //operasi,jurulelong
+        } else { // operasi
             $sag = LelongBid::where('status_semak', 0) // belum disemak
                 ->get();
         }
@@ -174,8 +161,7 @@ class HomeController extends Controller
             ->toArray();
         // dd($lelongmenang);
 
-        foreach($lelongmenang as $details)
+        foreach ($lelongmenang as $details) {
-        {
 
             $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id', 'caw_name', 'cawangan.caw_code', 'cawangan_lelong.export_data_sts')
@@ -184,8 +170,6 @@ class HomeController extends Controller
                 ->orderBy('lelong_id')
                 ->get();
 
-           
-           
             foreach ($detailsinfo as $index1 => $cal) {
                 $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
                 // ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
@@ -217,12 +201,12 @@ class HomeController extends Controller
                             }
                         }
                         $listwinner[$index]['details'] = $userdetails;
-                        $listwinner[$index]['total_surat'] = sizeof($SAGWin);
+                        $listwinner[$index]['total_surat'] = count($SAGWin);
                         $listwinner[$index]['totalBid'] = $SAGWin->sum('hargabida');
                         $listwinner[$index]['totalPay'] = $total_payment;
                         $listwinner[$index]['jenisbayaran'] = $detailspayment;
                     }
-                    $detailsinfo[$index1]['nama'] = "";
+                    $detailsinfo[$index1]['nama'] = '';
                     $detailsinfo[$index1]['listwinner'] = $listwinner;
                 }
             }
@@ -232,7 +216,6 @@ class HomeController extends Controller
         }
         // end paparan pemenang lelongan harini
 
-
         // paparan untuk account
         $arrayinfoaccount = [];
         $listwinner = [];
@@ -248,8 +231,7 @@ class HomeController extends Controller
             ->toArray();
         // dd($senarai);
 
-        foreach($senarai as $details)
+        foreach ($senarai as $details) {
-        {
             // dd($details['lelong_id']);
             $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id', 'caw_name', 'cawangan.caw_code', 'cawangan_lelong.export_data_sts')
@@ -259,12 +241,12 @@ class HomeController extends Controller
                 ->get();
 
             // dd($detailsinfo);
-            foreach($detailsinfo as $index1=>$details1)
+            foreach ($detailsinfo as $index1 => $details1) {
-            {
                 // dd($details1['caw_code']);
-                $listwinner = Payment::join('lelongbid', 'payment.kodcaw', '=', 'lelongbid.kodcaw')
+                $listwinner = Payment::join('lelongbidder', 'payment.id', '=', 'lelongbidder.payment_id')
-                ->join('lelongbidder', 'payment.id', '=', 'lelongbidder.payment_id')
+                    ->join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
                     ->where('lelongbidder.status_bidder', 1)
+                    ->where('payment.lelong_id', $details1['lelong_id'])
                     ->where('lelongbid.lelong_id', $details1['lelong_id'])
                     ->where('payment.kodcaw', $details1['caw_code'])
                 // ->where('lelongbidder.status_payment', 2)
@@ -276,8 +258,7 @@ class HomeController extends Controller
                     ->get();
 
                 // dd($listwinner);
-                foreach($listwinner as $index=>$listwin)
+                foreach ($listwinner as $index => $listwin) {
-                {
                     $namawinner = User::where('id', $listwin['user_id'])
                         ->first();
                     $total_payment = 0;
@@ -288,17 +269,14 @@ class HomeController extends Controller
                         ->where('lelongbidder.status_bidder', 1)
                         ->where('lelongbid.lelong_id', $listwin['lelong_id'])
                         ->get();
-                    foreach($SAGWin as $index2=>$sag)
+                    foreach ($SAGWin as $index2 => $sag) {
-                    {
                         // dd($detailspayment);
                         $detailspayment = null;
-                        if($sag['payment_id'] != null)
+                        if ($sag['payment_id'] != null) {
-                        {
                             $detailspayment = Payment::where('id', $sag['payment_id'])->first();
                             $total_payment = $total_payment + $detailspayment->total_payment;
                             // dd($total_payment);
-                        }else
+                        } else {
-                        {
                             $total_payment = '0.00';
                         }
                         $listwinner[$index]['jenisbayaran'] = $detailspayment;
@@ -318,10 +296,13 @@ class HomeController extends Controller
                 // dd($listwinner[$index]['nama']);
             }
 
-            
+            $hasPendingOnline = collect($detailsinfo)->contains(function ($info) {
-            
+                return isset($info['listwinner']) && count($info['listwinner']) > 0;
+            });
+            if ($hasPendingOnline) {
                 array_push($arrayinfoaccount, ['detail' => $details, 'detailsinfo' => $detailsinfo, 'listwinner' => $listwinner]);
             }
+        }
 
         $arrayinfoaccountcdm = [];
         $listwinnercdm = [];
@@ -337,8 +318,7 @@ class HomeController extends Controller
             ->toArray();
         // dd($senarai);
 
-        foreach($senaraicdm as $detailscdm)
+        foreach ($senaraicdm as $detailscdm) {
-        {
             // dd($details['lelong_id']);
             $detailsinfocdm = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id', 'caw_name', 'cawangan.caw_code', 'cawangan_lelong.export_data_sts')
@@ -348,12 +328,14 @@ class HomeController extends Controller
                 ->get();
 
             // dd($detailsinfo);
-            foreach($detailsinfocdm as $index1=>$details1cdm)
+            foreach ($detailsinfocdm as $index1 => $details1cdm) {
-            {
                 // dd($details1['caw_code']);
-                $listwinnercdm = Payment::join('lelongbid', 'payment.kodcaw', '=', 'lelongbid.kodcaw')
+                // Join via lelongbidder->lelongbid and filter payment.lelong_id so old
-                ->join('lelongbidder', 'payment.id', '=', 'lelongbidder.payment_id')
+                // unconfirmed CDM payments from other batches do not appear here.
+                $listwinnercdm = Payment::join('lelongbidder', 'payment.id', '=', 'lelongbidder.payment_id')
+                    ->join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
                     ->where('lelongbidder.status_bidder', 1)
+                    ->where('payment.lelong_id', $details1cdm['lelong_id'])
                     ->where('lelongbid.lelong_id', $details1cdm['lelong_id'])
                     ->where('payment.kodcaw', $details1cdm['caw_code'])
                 // ->where('lelongbidder.status_payment', 2)
@@ -369,8 +351,7 @@ class HomeController extends Controller
                     ->get();
 
                 // dd($listwinner);
-                foreach($listwinnercdm as $index=>$listwincdm)
+                foreach ($listwinnercdm as $index => $listwincdm) {
-                {
                     $namawinnercdm = User::where('id', $listwincdm['user_id'])
                         ->first();
                     $total_paymentcdm = 0;
@@ -381,17 +362,14 @@ class HomeController extends Controller
                         ->where('lelongbidder.status_bidder', 1)
                         ->where('lelongbid.lelong_id', $listwincdm['lelong_id'])
                         ->get();
-                    foreach($SAGWincdm as $index2=>$sagcdm)
+                    foreach ($SAGWincdm as $index2 => $sagcdm) {
-                    {
                         // dd($detailspayment);
                         $detailspaymentcdm = null;
-                        if($sagcdm['payment_id'] != null)
+                        if ($sagcdm['payment_id'] != null) {
-                        {
                             $detailspaymentcdm = Payment::where('id', $sagcdm['payment_id'])->first();
-                            $total_paymentcdm = $total_payment + $detailspaymentcdm->total_payment;
+                            $total_paymentcdm = $total_paymentcdm + $detailspaymentcdm->total_payment;
                             // dd($total_payment);
-                        }else
+                        } else {
-                        {
                             $total_paymentcdm = '0.00';
                         }
                         $listwinnercdm[$index]['jenisbayaran'] = $detailspaymentcdm;
@@ -411,13 +389,15 @@ class HomeController extends Controller
                 // dd($listwinner[$index]['nama']);
             }
 
-            
+            $hasPendingCdm = collect($detailsinfocdm)->contains(function ($info) {
-            
+                return isset($info['listwinner']) && count($info['listwinner']) > 0;
+            });
+            if ($hasPendingCdm) {
                 array_push($arrayinfoaccountcdm, ['detailcdm' => $detailscdm, 'detailsinfocdm' => $detailsinfocdm, 'listwinnercdm' => $listwinnercdm]);
             }
+        }
         // endpaparan untuk account page
 
-        
         return view('home', compact('all_lelong', 'lelongmutu', 'arrayinfomutu', 'arrayinfo', 'sag', 'semakCountArray', 'arrayinfomenang', 'arrayinfoaccount', 'arrayinfoaccountcdm'));
 
     }
@@ -462,9 +442,10 @@ class HomeController extends Controller
                     ->get();
 
                 foreach ($detailsinfo as $index1 => $details1) {
-                    $listwinner = Payment::join('lelongbid', 'payment.kodcaw', '=', 'lelongbid.kodcaw')
+                    $listwinner = Payment::join('lelongbidder', 'payment.id', '=', 'lelongbidder.payment_id')
-                    ->join('lelongbidder', 'payment.id', '=', 'lelongbidder.payment_id')
+                        ->join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
                         ->where('lelongbidder.status_bidder', 1)
+                        ->where('payment.lelong_id', $details1['lelong_id'])
                         ->where('lelongbid.lelong_id', $details1['lelong_id'])
                         ->where('payment.kodcaw', $details1['caw_code'])
                         ->where('payment.status', 2)
@@ -503,8 +484,13 @@ class HomeController extends Controller
                     }
                     $detailsinfo[$index1]['listwinner'] = $listwinner;
                 }
+                $hasPendingOnline = collect($detailsinfo)->contains(function ($info) {
+                    return isset($info['listwinner']) && count($info['listwinner']) > 0;
+                });
+                if ($hasPendingOnline) {
                     array_push($arrayinfoaccount, ['detail' => $details, 'detailsinfo' => $detailsinfo, 'listwinner' => $listwinner]);
                 }
+            }
 
             $arrayinfoaccountcdm = [];
             $listwinnercdm = [];
@@ -527,9 +513,12 @@ class HomeController extends Controller
                     ->get();
 
                 foreach ($detailsinfocdm as $index1 => $details1cdm) {
-                    $listwinnercdm = Payment::join('lelongbid', 'payment.kodcaw', '=', 'lelongbid.kodcaw')
+                    // Join via lelongbidder->lelongbid and filter payment.lelong_id so old
-                    ->join('lelongbidder', 'payment.id', '=', 'lelongbidder.payment_id')
+                    // unconfirmed CDM payments from other batches do not appear here.
+                    $listwinnercdm = Payment::join('lelongbidder', 'payment.id', '=', 'lelongbidder.payment_id')
+                        ->join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
                         ->where('lelongbidder.status_bidder', 1)
+                        ->where('payment.lelong_id', $details1cdm['lelong_id'])
                         ->where('lelongbid.lelong_id', $details1cdm['lelong_id'])
                         ->where('payment.kodcaw', $details1cdm['caw_code'])
                         ->where('payment.status', 2)
@@ -554,7 +543,7 @@ class HomeController extends Controller
                             $detailspaymentcdm = null;
                             if ($sagcdm['payment_id'] != null) {
                                 $detailspaymentcdm = Payment::where('id', $sagcdm['payment_id'])->first();
-                                $total_paymentcdm = $total_payment + $detailspaymentcdm->total_payment;
+                                $total_paymentcdm = $total_paymentcdm + $detailspaymentcdm->total_payment;
                             } else {
                                 $total_paymentcdm = '0.00';
                             }
@@ -568,8 +557,14 @@ class HomeController extends Controller
                     }
                     $detailsinfocdm[$index1]['listwinner'] = $listwinnercdm;
                 }
+                $hasPendingCdm = collect($detailsinfocdm)->contains(function ($info) {
+                    return isset($info['listwinner']) && count($info['listwinner']) > 0;
+                });
+                if ($hasPendingCdm) {
                     array_push($arrayinfoaccountcdm, ['detailcdm' => $detailscdm, 'detailsinfocdm' => $detailsinfocdm, 'listwinnercdm' => $listwinnercdm]);
                 }
+            }
+
             return view('homeaccount', compact('arrayinfoaccount', 'arrayinfoaccountcdm'));
         }
 
@@ -581,7 +576,7 @@ class HomeController extends Controller
             $data->tarikh_lelong = $data->tarikh_lelong->format('d-m-Y');
         }
 
-        if ($caw <> NULL) {
+        if ($caw != null) {
             $sag = LelongBid::where('status_semak', 0)
                 ->where('kodcaw', $caw['caw_code'])
                 ->get();
@@ -589,10 +584,10 @@ class HomeController extends Controller
             $sag_by_lelong_id = $sag->groupBy('lelong_id');
 
             foreach ($sag_by_lelong_id as $index => $lelong) {
-                if ($all_lelong[$index]); {
+                if ($all_lelong[$index]);
                 $all_lelong[$index]['sag_belum_semak'] = $lelong->count();
                 $all_lelong[$index]['total_pjm'] = $lelong->sum('pinjaman');
-                }
+
             }
         } else {
             $sag = Lelong::select('id', 'tarikh_lelong', 'fasa')
@@ -608,7 +603,7 @@ class HomeController extends Controller
             }
         }
 
-        if ($user->hasAnyRole('operasi', 'pengurus-operasi', 'jurulelong')) {
+        if ($user->hasAnyRole('operasi', 'pengurus-operasi')) {
 
             $arrayinfo = [];
 
@@ -642,7 +637,6 @@ class HomeController extends Controller
                     $detailsinfo[$index50]['belum_semak'] = $cawsemak;
                 }
 
-
                 array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo]);
             }
             $arrayinfomenang = [];
@@ -666,8 +660,6 @@ class HomeController extends Controller
                     ->orderBy('lelong_id')
                     ->get();
 
-
-
                 foreach ($detailsinfo as $index1 => $cal) {
                     $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
                         ->where('lelongbidder.status_bidder', 1)
@@ -696,12 +688,12 @@ class HomeController extends Controller
                                 }
                             }
                             $listwinner[$index]['details'] = $userdetails;
-                            $listwinner[$index]['total_surat'] = sizeof($SAGWin);
+                            $listwinner[$index]['total_surat'] = count($SAGWin);
                             $listwinner[$index]['totalBid'] = $SAGWin->sum('hargabida');
                             $listwinner[$index]['totalPay'] = $total_payment;
                             $listwinner[$index]['jenisbayaran'] = $detailspayment;
                         }
-                        $detailsinfo[$index1]['nama'] = "";
+                        $detailsinfo[$index1]['nama'] = '';
                         $detailsinfo[$index1]['listwinner'] = $listwinner;
                     }
                 }
@@ -717,7 +709,7 @@ class HomeController extends Controller
                 ->join('lelongbid', 'lelongbid.norujukan', '=', 'pengesahan.norujukan')
                 ->where('lelongbid.kodcaw', $user->kodcaw)
                 ->whereIn('pengesahan.status_ubah', [1, 2, 3, 4, 5, 7, 8, 9, 10])
-                ->where('disahkan_oleh', '=', NULL)
+                ->where('disahkan_oleh', '=', null)
                 ->select('pengesahan.lelong_id', 'lelong.id', 'lelong.tarikh_lelong', 'lelong.masatamat_lelong', 'lelong.harga_emas_asas', 'lelong.jbg', 'lelong.cajlelong', 'sts_lelong')
                 ->distinct()
                 ->get()
@@ -734,7 +726,10 @@ class HomeController extends Controller
             return view('homecawangan', compact('all_lelong', 'arrayinfomutu'));
         } else {
             Auth::logout();
-            return redirect()->route('login');
+            return redirect()->route('login')->with(
+                'failed',
+                'Akaun ini tiada peranan (role) yang sah. Sila hubungi admin untuk tetapkan role.'
+            );
         }
     }
 
@@ -752,17 +747,14 @@ class HomeController extends Controller
         // dd($user->kodcaw);
 
         $lelong = pengesahan::join('lelong', 'lelong.id', '=', 'pengesahan.lelong_id')
-        
             ->whereIn('pengesahan.status_ubah', [1, 2, 3, 4, 5])
             ->select('pengesahan.lelong_id', 'lelong.id', 'lelong.tarikh_lelong', 'lelong.masatamat_lelong', 'lelong.harga_emas_asas', 'lelong.jbg', 'lelong.cajlelong', 'sts_lelong')
         // ->groupBy('pengesahan.lelong_id')
-       
             ->distinct()
             ->get()
             ->toArray();
 
-        foreach($lelong as $info)
+        foreach ($lelong as $info) {
-        {
             $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('lelong_id', $info['lelong_id'])
                 ->get()
@@ -780,54 +772,62 @@ class HomeController extends Controller
         return view('profil');
     }
 
-    public function profileUpdate(Request $request){
+    public function profileUpdate(Request $request)
+    {
         // validation rules
 
         $request->validate([
             'name' => 'required|min:4|string|max:255',
             'username' => 'required|min:4|string|max:255',
-            'email'=>'required|email|string|max:255'
+            'email' => 'required|email|string|max:255',
         ]);
         $user = Auth::user();
         $user->name = $request['name'];
         $user->email = $request['email'];
         $user->save();
+
         return back()->with('message', 'Profil Telah Kemaskini');
     }
+
     public function tukarkatalaluan()
     {
         // $user =  Auth::user();
         // $user->assignRole('admin');
         return view('tukarkatalaluan');
     }
-    public function tukarkatalaluanupdate(Request $request){
+
+    public function tukarkatalaluanupdate(Request $request)
+    {
         // validation rules
 
         $request->validate([
             'name' => 'required|min:4|string|max:255',
             'username' => 'required|min:4|string|max:255',
-            'email'=>'required|email|string|max:255'
+            'email' => 'required|email|string|max:255',
         ]);
         $user = Auth::user();
         $user->name = $request['name'];
         $user->email = $request['email'];
         $user->save();
+
         return back()->with('message', 'Profil Telah Kemaskini');
     }
 
-    public function showChangePasswordGet() {
+    public function showChangePasswordGet()
+    {
         return view('tukarkatalaluan');
     }
 
-    public function changePasswordPost(Request $request) {
+    public function changePasswordPost(Request $request)
+    {
         if (! (Hash::check($request->get('current-password'), Auth::user()->password))) {
             // The passwords matches
-            return redirect()->back()->with("error","Katalaluan Lama Tidak Sama Dengan katalaluan.");
+            return redirect()->back()->with('error', 'Katalaluan Lama Tidak Sama Dengan katalaluan.');
         }
 
         if (strcmp($request->get('current-password'), $request->get('new-password')) == 0) {
             // Current password and new password same
-            return redirect()->back()->with("error","Katalaluan Baru Tidak Boleh Sama Dengan Katalaluan Lama.");
+            return redirect()->back()->with('error', 'Katalaluan Baru Tidak Boleh Sama Dengan Katalaluan Lama.');
         }
 
         $validatedData = $request->validate([
@@ -840,7 +840,7 @@ class HomeController extends Controller
         $user->password = bcrypt($request->get('new-password'));
         $user->save();
 
-        return redirect()->back()->with("success","Katalaluan Berjaya Dikemaskini!");
+        return redirect()->back()->with('success', 'Katalaluan Berjaya Dikemaskini!');
     }
 
     public function reloadJobDetail()
@@ -867,8 +867,8 @@ class HomeController extends Controller
                     $job_collect_alter[$index]['user_name'] = $user_true->name;
                 }
             }
+
             return response()->json($job_collect_alter);
         }
     }
-    
 }

app/Http/Controllers/ImportDataController.php

@@ -2,26 +2,16 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Support\Facades\Auth;
+use App\Models\Cawangan;
-use Illuminate\Http\Request;
+use App\Models\CawanganLelong;
-use Carbon\Carbon;
-
-use App\Models\User;
 use App\Models\Gadai;
 use App\Models\GadaiMarhun;
-use App\Models\Cawangan;
-use App\Models\TransaksiKeuntungan;
-use App\Models\CawanganLelong;
-use App\Models\LelongBid;
 use App\Models\Lelong;
+use App\Models\LelongBid;
 use App\Models\LelongBidMarhun;
-
+use Carbon\Carbon;
-use DateTime;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Input;
-
-
-
 
 class ImportDataController extends Controller
 {
@@ -30,6 +20,7 @@ class ImportDataController extends Controller
     {
         // return view('importdata.importdatacawangan');
         $caw = Cawangan::all();
+
         return view('importdata.listcawangan', compact('caw'));
 
     }
@@ -37,6 +28,7 @@ class ImportDataController extends Controller
     public function listcawangan()
     {
         $caw = Cawangan::all();
+
         return view('importdata.listcawangan', compact('caw'));
     }
 
@@ -51,12 +43,10 @@ class ImportDataController extends Controller
     {
         // dd($kodcaw);
         $caw = Cawangan::all();
-        if (Gadai::where('kodcaw', '=', $kodcaw)->count() == null) 
+        if (Gadai::where('kodcaw', '=', $kodcaw)->count() == null) {
-        {
             $results = DB::select("SELECT * FROM cawangan where caw_code  = '$kodcaw' ");
             // dd($results);
-                foreach($results as $row)
+            foreach ($results as $row) {
-                {
                 $caw_ip = $row->caw_ip;
                 $caw_dbuser = $row->caw_dbuser;
                 $caw_dbpass = $row->caw_dbpass;
@@ -67,18 +57,17 @@ class ImportDataController extends Controller
                 // dd($caw_ip);
 
                 $db = mysqli_connect($caw_ip, $caw_dbuser, $caw_dbpass);
-                if (!$db)
+                if (! $db) {
-                    {   
                     echo "<p style='color:#F00'>Server Down: $caw_name</p>";
+
                     continue;
-                    die('Could not connect: ' . mysqli_error());
+                    exit('Could not connect: '.mysqli_error());
                 }
                 mysqli_select_db($db, $caw_dbname);
 
                 $count = 0;
                 $result = mysqli_query($db, "SELECT kodcaw,norujukan,nopelanggan,nokp,t_gadai,masa,sirig,nilaimarhun,berat,pinjaman,sttebus,tagcetak,kadarupah,tempoh,t_matang,t_matang1,teller,bakipjm,bakiupah,marhun,taglel,ansakhir,t_update,tagtbaki,penilai,percentpinj,tagpalsu,semakbarcode,historygadaian,upah12,hargajualan,bakihargajualan,tempohbayar,lelong_tawarruq FROM gadai where taglel = '0' and sttebus = '' and upah12 is NOT NULL");
-                        while($row_gadai = mysqli_fetch_array($result))
+                while ($row_gadai = mysqli_fetch_array($result)) {
-                        {	
 
                     $count++;
                     $kodcaw = $row_gadai['kodcaw'];
@@ -119,8 +108,7 @@ class ImportDataController extends Controller
 
                     // untuk gadaimarhun
                     $result1 = mysqli_query($db, "SELECT * FROM marhun where norujukan = '$norujukan'");
-                                while($row_tender1 = mysqli_fetch_array($result1))
+                    while ($row_tender1 = mysqli_fetch_array($result1)) {
-                                {	
 
                         $kodcaw1 = $row_tender1['kodcaw'];
                         $norujukan1 = $row_tender1['norujukan'];
@@ -140,6 +128,7 @@ class ImportDataController extends Controller
                     }
 
                 }
+
                 return redirect()->route('importdata.listcawangan')
                     ->with('success', 'Data '.$caw_name.' berjaya import');
 
@@ -149,8 +138,8 @@ class ImportDataController extends Controller
                 ->with('success', 'Data '.$kodcaw.' Ini Telah Wujud Sila Hapus Data Dahulu');
         }
 
-
     }
+
     public function hapusdatacawangan($kodcaw)
     {
         $caw = Gadai::where('kodcaw', '=', $kodcaw);
@@ -158,6 +147,7 @@ class ImportDataController extends Controller
 
         $cawmarhun = GadaiMarhun::where('kodcaw', '=', $kodcaw);
         $cawmarhun->delete();
+
         // dd($cawmarhun);
         return redirect()->route('importdata.listcawangan')
             ->with('success', 'Data '.$kodcaw.' Berjaya Dihapuskan');
@@ -176,8 +166,7 @@ class ImportDataController extends Controller
             ->select('export_data_sts')
             ->first();
         // dd($carian->export_data_sts);
-        if ($carian->export_data_sts == NULL ) 
+        if ($carian->export_data_sts == null) {
-        {
             // untuk dapatkan tarikhlelong sebenar
             $datacawlel = Lelong::where('id', '=', $lelong_id)->first();
 
@@ -187,8 +176,7 @@ class ImportDataController extends Controller
             $cajlelong = $datacawlel->cajlelong;
 
             $results = DB::select("SELECT * FROM cawangan where caw_code  = '$kodcaw' ");
-                            foreach($results as $row)
+            foreach ($results as $row) {
-                            {
                 $caw_ip = $row->caw_ip;
                 $caw_dbuser = $row->caw_dbuser;
                 $caw_dbpass = $row->caw_dbpass;
@@ -199,16 +187,16 @@ class ImportDataController extends Controller
                 // dd($results);
 
                 $db = mysqli_connect($caw_ip, $caw_dbuser, $caw_dbpass);
-										if (!$db)
+                if (! $db) {
-										{   
                     echo "<p style='color:#F00'>Server Down: $caw_name</p>";
+
                     continue;
-                                            die('Could not connect: ' . mysqli_error());
+                    exit('Could not connect: '.mysqli_error());
                 }
 
                 mysqli_select_db($db, $caw_dbname);
 
-                                        $result_batchlel=mysqli_query($db,"SELECT MAX(batchno) AS bil  FROM  batchlel");
+                $result_batchlel = mysqli_query($db, 'SELECT MAX(batchno) AS bil  FROM  batchlel');
                 $row_batchlel = mysqli_fetch_array($result_batchlel);
                 $newbatchlel = $row_batchlel['bil'] + 1;
                 $insert1 = mysqli_query($db, "INSERT INTO batchlel (kodcaw,batchno,tarikh,tarikh2,masadari,masahingga,pilihankos,pcntkos) VALUES ('$kodcaw','$newbatchlel','$tarikh_lelong','$tarikh_lelong','$masamula_lelong','$masatamat_lelong','P','$cajlelong') ");
@@ -220,15 +208,13 @@ class ImportDataController extends Controller
                 // dd($datalelbid);
                 $suratcaw = $datalelbid->all();
                 $sirilel = 0;
-                                                foreach(array_chunk($suratcaw,100) as $data_chunk)
+                foreach (array_chunk($suratcaw, 100) as $data_chunk) {
-                                                {
+                    foreach ($data_chunk as $data) {
-                                                    foreach($data_chunk as $data)
-                                                   {
                         $sirilel++;
 
                         $insert2 = mysqli_query($db, "INSERT INTO audtrail (tarikh,teller,act,transaksi,kodcaw,norujukan) VALUES ('$currentdate','LELONG','JUAL','LELONG','$kodcaw','$data->norujukan') ");
                         // getglcode
-                                                        $result_parameter=mysqli_query($db,"SELECT * from product");
+                        $result_parameter = mysqli_query($db, 'SELECT * from product');
                         $row_parameter = mysqli_fetch_array($result_parameter);
                         $glcode = $row_parameter['glcode'];
                         $kodgl = $row_parameter['kodgl'];
@@ -240,18 +226,14 @@ class ImportDataController extends Controller
 
                         $resultss = mysqli_query($db, "SELECT *  FROM  pembeli WHERE nokp = '$data->nokp'");
                         $row_tender = mysqli_fetch_array($resultss);
-                                                            if($row_tender == null)
+                        if ($row_tender == null) {
-                                                            
+                            $result_pembeli = mysqli_query($db, 'SELECT MAX(nopembeli) AS bil  FROM  pembeli');
-                                                            {
-                                                                $result_pembeli=mysqli_query($db,"SELECT MAX(nopembeli) AS bil  FROM  pembeli");
                             $row_pembeli = mysqli_fetch_array($result_pembeli);
                             $nopembelibaru = $row_pembeli['bil'] + 1;
 
                             $insert4 = mysqli_query($db, "INSERT INTO pembeli (nopembeli,nokp,nama,alamat1,telefon) VALUES ('$nopembelibaru','$data->nokp','$data->name','$data->alamat','$data->notelbimbit') ");
                             $update1 = mysqli_query($db, "UPDATE lelong SET nopembeli = '$nopembelibaru' where norujukan = '$data->norujukan' and batchno = '$newbatchlel'");
-                                                            }
+                        } else {
-                                                            else
-                                                            {
                             $nopembeli = $row_tender['nopembeli'];
                             $update2 = mysqli_query($db, "UPDATE lelong SET nopembeli = '$nopembeli' where norujukan = '$data->norujukan' and batchno = '$newbatchlel'");
 
@@ -269,10 +251,8 @@ class ImportDataController extends Controller
                     ->get();
                 // dd($datalelbidmarhun);
                 $suratcawmarhun = $datalelbidmarhun->all();
-                                                    foreach(array_chunk($suratcawmarhun,100) as $data_chunkmarhun)
+                foreach (array_chunk($suratcawmarhun, 100) as $data_chunkmarhun) {
-                                                    {
+                    foreach ($data_chunkmarhun as $datamarhun) {
-                                                        foreach($data_chunkmarhun as $datamarhun)
-                                                       {
                         // $sirilel++;
                         // $batchno = $q1['batch_no'];
                         $kodcaw = $datamarhun->kodcaw;
@@ -288,7 +268,6 @@ class ImportDataController extends Controller
                     }
                 }
 
-
             }
             $updatecawlel = CawanganLelong::where('caw_id', '=', $cawid)
                 ->where('lelong_id', '=', $lelong_id)
@@ -298,22 +277,13 @@ class ImportDataController extends Controller
             $updatecawlel->export_data_stsdate = $currentdate;
             $updatecawlel->update();
 
-
-
             return redirect()->route('pembida.senlelpembayaranbidaan')
                 ->with('success', 'Data '.$caw_name.' berjaya export');
 
-                }else
+        } else {
-                {
             return redirect()->route('pembida.senlelpembayaranbidaan')
                 ->with('success', 'Data Tidak berjaya export');
         }
 
-        
-
     }
-
-
-
-    
 }

app/Http/Controllers/KpiController.php

@@ -2,24 +2,18 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use Carbon\Carbon;
 use App\Models\Cawangan;
-use App\Models\Tetapan;
 use App\Models\CawanganKpi;
 use App\Models\DataKpi;
 use App\Models\Jawatan;
+use App\Models\Tetapan;
 use App\Models\UserKaunter;
-use App\Models\Gadai;
-use App\Models\TransaksiKeuntungan;
-use Illuminate\Support\Facades\Http;
 use App\Services\RingkasanHarianServices;
+use Carbon\Carbon;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Http;
 use PDF;
 
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Input;
-
-
 class KpiController extends Controller
 {
     //
@@ -36,10 +30,13 @@ class KpiController extends Controller
         // $bulan = Bulan::all();
         // $tahun = Tahun::all();
         $years = [];
-        for ($year=2023; $year <= 2024; $year++) $years[$year] = $year;
+        for ($year = 2023; $year <= 2024; $year++) {
+            $years[$year] = $year;
+        }
         $jawatan = Jawatan::all();
         // dd($bulan);
         $tetapan = Tetapan::where('id', '=', 1)->first();
+
         return view('kpi.janakpi', compact('caw', 'tetapan', 'currentDate', 'years', 'jawatan'));
     }
 
@@ -48,8 +45,8 @@ class KpiController extends Controller
         $bulan = $request->month;
         $tahun = $request->year;
         $jawatan = $request->jawatan[0];
-        $mula = date("Y-m-d",strtotime("$tahun-$bulan-01")); //2023-01-01
+        $mula = date('Y-m-d', strtotime("$tahun-$bulan-01")); // 2023-01-01
-        $hingga = date("Y-m-t",strtotime("$tahun-$bulan-01")); //2023-01-31
+        $hingga = date('Y-m-t', strtotime("$tahun-$bulan-01")); // 2023-01-31
 
         if ($jawatan == 'pc') {
             $cawangan_all = Cawangan::orderBy('caw_name')->get();
@@ -92,9 +89,7 @@ class KpiController extends Controller
                 }
                 //    dump($data);
             }
-            }
+        } elseif ($jawatan == 'ppc') {
-
-            else if($jawatan == 'ppc'){
             $cawangan_all = Cawangan::orderBy('caw_name')->get();
             $nama_jawatan = Jawatan::where('idjawatan', $jawatan)->first();
             $senarai = [];
@@ -122,11 +117,9 @@ class KpiController extends Controller
                     $aging = Http::get(config('app.api_url').'laporan/aging', [
                         'kodcaw' => $kodcaw,
                         'tahun' => $tahun,
-                                'bulan'=>$bulan
+                        'bulan' => $bulan,
                     ])->json();
 
-
-
                     $data = [
                         // 'cawid'=>$getnamapc['name'],
                         'nama_staff' => $getnamapc['name'],
@@ -141,8 +134,7 @@ class KpiController extends Controller
                     array_push($senarai, $data);
                 }
             }
-            }
+        } elseif ($jawatan == 'teller') {
-            else if($jawatan == 'teller'){
             $cawangan_all = Cawangan::orderBy('caw_name')->get();
             $nama_jawatan = Jawatan::where('idjawatan', $jawatan)->first();
             $senarai = [];
@@ -210,8 +202,7 @@ class KpiController extends Controller
                     array_push($senarai, $data);
                 }
             }
-            }
+        } elseif ($jawatan == 'penilai') {
-            else if($jawatan == 'penilai'){
             $cawangan_all = Cawangan::orderBy('caw_name')->get();
             $nama_jawatan = Jawatan::where('idjawatan', $jawatan)->first();
             $senarai = [];
@@ -225,7 +216,7 @@ class KpiController extends Controller
 
                 $gadaipenilai = Http::get(config('app.api_url').'getLaporanGadaiRangeDatebyPenilai/'.$kodcaw, [
                     'mula' => $mula,
-                                'akhir' => $hingga
+                    'akhir' => $hingga,
                 ])->json();
                 foreach ($gadaipenilai as $index => $datapenilai) {
                     $getnokppenilai = UserKaunter::where('cawangan', $cawangan->caw_code)
@@ -281,10 +272,10 @@ class KpiController extends Controller
         $jawatan = $request->jawatan;
         $bulan = $request->bulan;
         $tahun = $request->tahun;
-        $mula = date("Y-m-d",strtotime("$tahun-$bulan-01")); //2023-01-01
+        $mula = date('Y-m-d', strtotime("$tahun-$bulan-01")); // 2023-01-01
-        $hingga = date("Y-m-t",strtotime("$tahun-$bulan-01")); //2023-01-31
+        $hingga = date('Y-m-t', strtotime("$tahun-$bulan-01")); // 2023-01-31
         $current = Carbon::now();
-        $current = new Carbon();
+        $current = new Carbon;
         $currentNow = Carbon::now();
         $tarikh_savekpi = $current->toDateString();
         $selected_caw = $request->kodcaw;
@@ -336,8 +327,7 @@ class KpiController extends Controller
                     ];
 
                     array_push($datakpi_temp_arr, $datakpi_to_be_inserted);
-                        }
+                } else {
-                        else {
                     return redirect()
                         ->route('janakpi.janaekpi')
                         ->with('failed', 'Maaf, Bulan dan Tahun KPI bagi nama staff ini telah wujud dalam db.');
@@ -346,8 +336,7 @@ class KpiController extends Controller
             }
             DataKpi::insert($datakpi_temp_arr);
 
-                }
+        } elseif ($jawatan == 'ppc') {
-                else if($jawatan == 'ppc'){
             $datakpi_temp_arr = [];
             foreach ($request->nama_staff as $key => $datastaff) {
                 $checkExisting = CawanganKpi::where('namastaff', '=', $request->nama_staff[$key])
@@ -390,18 +379,14 @@ class KpiController extends Controller
 
                     array_push($datakpi_temp_arr, $datakpi_to_be_inserted);
 
-                            
+                } else {
-                            
-                        }
-                        else {
                     return redirect()
                         ->route('janakpi.janaekpi')
                         ->with('failed', 'Maaf, Bulan dan Tahun KPI bagi nama staff ini telah wujud dalam db.');
                 }
             }
             DataKpi::insert($datakpi_temp_arr);
-                }
+        } elseif ($jawatan == 'teller') {
-                else if($jawatan == 'teller'){
             // dd($request->all());
             $datakpi_temp_arr = [];
             foreach ($request->nama_staff as $key => $datastaff) {
@@ -445,18 +430,14 @@ class KpiController extends Controller
 
                     array_push($datakpi_temp_arr, $datakpi_to_be_inserted);
 
-                                
+                } else {
-                               
-                        }
-                        else {
                     return redirect()
                         ->route('janakpi.janaekpi')
                         ->with('failed', 'Maaf, Bulan dan Tahun KPI bagi nama staff ini telah wujud dalam db.');
                 }
             }
             DataKpi::insert($datakpi_temp_arr);
-                }
+        } elseif ($jawatan == 'penilai') {
-                else if($jawatan == 'penilai'){
             // dd($request->all());
             $datakpi_temp_arr = [];
             foreach ($request->nama_staff as $key => $datastaff) {
@@ -498,10 +479,7 @@ class KpiController extends Controller
 
                     array_push($datakpi_temp_arr, $datakpi_to_be_inserted);
 
-                                
+                } else {
-                            
-                    }
-                    else {
                     return redirect()
                         ->route('janakpi.janaekpi')
                         ->with('failed', 'Maaf, Bulan dan Tahun KPI bagi nama staff ini telah wujud dalam db.');
@@ -510,8 +488,6 @@ class KpiController extends Controller
             DataKpi::insert($datakpi_temp_arr);
         }
 
-            
-
         // }
         // else
         // {
@@ -519,12 +495,13 @@ class KpiController extends Controller
         // }
 
         return redirect()->route('janakpi.janaekpi')
-                          ->with('success',"Berjaya Daftar KPI ".$jawatan.' ('.$bulan.'/'.$tahun.')');
+            ->with('success', 'Berjaya Daftar KPI '.$jawatan.' ('.$bulan.'/'.$tahun.')');
         // return redirect()->route('analisa.senaraisimulasi')->with('success',"Success daftar simulasi!");
 
     }
 
-    Public function listdatakpi(){
+    public function listdatakpi()
+    {
         $tahunkpi = date('Y');
         $senarai = [];
         $cawangan_all = Cawangan::with(['cawanganKpi'])
@@ -550,13 +527,15 @@ class KpiController extends Controller
 
             $cawangan_all_groupby_caw = $cawangan->groupBy('caw_code');
 
-                $cawangan_all[$index3]["cawangan_info"] = $cawangan;
+            $cawangan_all[$index3]['cawangan_info'] = $cawangan;
-                $cawangan_all[$index3]["namastaff"] = $getnamastaff;
+            $cawangan_all[$index3]['namastaff'] = $getnamastaff;
         }
+
         return view('kpi.datakpibycaw', compact('cawangan_all', 'senarai'));
     }
 
-    Public function listdatakpidetail($nokpstaff,$kodcaw, Request $request){
+    public function listdatakpidetail($nokpstaff, $kodcaw, Request $request)
+    {
         $getnamastaff = CawanganKpi::where('kodcaw', $kodcaw)
             ->where('nokpstaff', $nokpstaff)
             ->first();
@@ -575,16 +554,16 @@ class KpiController extends Controller
 
         foreach ($bycaw_all as $index3 => $listbatch) {
             $bycaw_all_groupby_caw = $listbatch->groupBy('lelong_id');
-                $bycaw_all[$index3]["datakpi_info"] = $listbatch->dataKpi;
+            $bycaw_all[$index3]['datakpi_info'] = $listbatch->dataKpi;
-                $bycaw_all[$index3]["nama_caw"] = $listbatch->cawangan->caw_name;
+            $bycaw_all[$index3]['nama_caw'] = $listbatch->cawangan->caw_name;
         }
+
         return view('kpi.datakpibycawdetail', compact('getnamastaff', 'bycaw_all', 'jawatan', 'kodcaw'));
 
-       
-
     }
 
-    Public function checkpenilai($nokpstaff,$jawatan){
+    public function checkpenilai($nokpstaff, $jawatan)
+    {
 
         $getnamastaff = CawanganKpi::where('nokpstaff', $nokpstaff)
             ->where('jawatan', $jawatan)
@@ -605,17 +584,18 @@ class KpiController extends Controller
         foreach ($bycaw_all as $index3 => $listbatch) {
             // dd($listbatch->toArray());
             $bycaw_all_groupby_caw = $listbatch->groupBy('lelong_id');
-                $bycaw_all[$index3]["datakpi_info"] = $listbatch->dataKpi;
+            $bycaw_all[$index3]['datakpi_info'] = $listbatch->dataKpi;
-                $bycaw_all[$index3]["nama_caw"] = $listbatch->cawangan->caw_name;
+            $bycaw_all[$index3]['nama_caw'] = $listbatch->cawangan->caw_name;
             // $bycaw_all[$index3]["nama_caw"] = $listbatch->cawangan;
         }
+
         // dd($bycaw_all);
         return view('kpi.datakpibycawdetail', compact('getnamastaff', 'bycaw_all', 'jawatan'));
 
-
     }
 
-    Public function listdatakpidetail2($nokpstaff,$kodcaw, Request $request){
+    public function listdatakpidetail2($nokpstaff, $kodcaw, Request $request)
+    {
         $namacaw = Cawangan::where('caw_code', $kodcaw)->first();
         $getnamastaff = CawanganKpi::where('kodcaw', $kodcaw)
             ->where('nokpstaff', $nokpstaff)
@@ -638,19 +618,16 @@ class KpiController extends Controller
         foreach ($bycaw_all as $index3 => $listbatch) {
             // dd($listbatch->toArray());
             $bycaw_all_groupby_caw = $listbatch->groupBy('lelong_id');
-                        $bycaw_all[$index3]["datakpi_info"] = $listbatch->dataKpi;
+            $bycaw_all[$index3]['datakpi_info'] = $listbatch->dataKpi;
-                        $bycaw_all[$index3]["nama_caw"] = $listbatch->cawangan->caw_name;
+            $bycaw_all[$index3]['nama_caw'] = $listbatch->cawangan->caw_name;
-                        $bycaw_all[$index3]["jawatan1"] = $jawatan1;
+            $bycaw_all[$index3]['jawatan1'] = $jawatan1;
             // $bycaw_all[$index3]["nama_caw"] = $listbatch->cawangan;
         }
-                if($request->type == 'excel')
+        if ($request->type == 'excel') {
-                {
 
             return view('kpi.datakpibycawdetail_excel', compact('getnamastaff', 'bycaw_all', 'jawatan', 'kodcaw', 'jawatan1'));
 
-                }
+        } else {
-                else
-                {
             $pdf = PDF::loadView('kpi.datakpibycawdetail_pdf', compact('getnamastaff', 'bycaw_all', 'jawatan', 'kodcaw', 'jawatan1', 'namacaw'))
                 ->setPaper('a4', 'potrait');
 
@@ -658,7 +635,8 @@ class KpiController extends Controller
         }
     }
 
-            Public function listdatakpidetailall($kodcaw, Request $request){
+    public function listdatakpidetailall($kodcaw, Request $request)
+    {
         $kodcaw = $kodcaw;
         $getnamastaff = CawanganKpi::where('kodcaw', $kodcaw)
             ->groupBy('jawatan', 'nokpstaff')
@@ -675,14 +653,14 @@ class KpiController extends Controller
         foreach ($groupby_nama as $index => $nama) {
             $groupby_jawatan = $nama->groupBy('jawatan');
             $collection_datakpi->push($groupby_jawatan);
-                            $groupby_nama[$index]["jawatan"] = $groupby_jawatan;
+            $groupby_nama[$index]['jawatan'] = $groupby_jawatan;
         }
 
-                       
         return view('kpi.datakpibycawdetailall', compact('collection_datakpi', 'kodcaw'));
     }
 
-            Public function listdatakpidetailall2($kodcaw, Request $request){
+    public function listdatakpidetailall2($kodcaw, Request $request)
+    {
         $namacaw = Cawangan::where('caw_code', $kodcaw)->first();
         $getnamastaff = CawanganKpi::where('kodcaw', $kodcaw)
             ->groupBy('jawatan', 'nokpstaff')
@@ -697,29 +675,24 @@ class KpiController extends Controller
         foreach ($groupby_nama as $index => $nama) {
             $groupby_jawatan = $nama->groupBy('jawatan');
             $collection_datakpi->push($groupby_jawatan);
-                    $groupby_nama[$index]["jawatan"] = $groupby_jawatan;
+            $groupby_nama[$index]['jawatan'] = $groupby_jawatan;
         }
 
-                if($request->type == 'excel')
+        if ($request->type == 'excel') {
-                {
 
             return view('kpi.datakpibycawdetailall_excel', compact('collection_datakpi', 'kodcaw'));
 
-                }
+        } else {
-                else
-                {
             $pdf = PDF::loadView('kpi.datakpibycawdetailall_pdf', compact('collection_datakpi', 'kodcaw', 'namacaw'))
                 ->setPaper('a4', 'potrait');
 
             return $pdf->download('Data KPI Keseluruhan'.$kodcaw.'.pdf');
         }
 
-               
         return view('kpi.datakpibycawdetailall', compact('collection_datakpi'));
 
-               
-        
     }
+
     public function hapusdatakpi($recno)
     {
         $datastaff = DataKpi::where('id', '=', $recno)
@@ -741,12 +714,9 @@ class KpiController extends Controller
         if ($checkExisting->isEmpty()) {
             return redirect()->route('janakpi.listdatakpi')
                 ->with('success', 'Data '.$kodcaw.' Berjaya Dihapuskan');
-                        }
+        } else {
-                        else{
             return redirect()->route('janakpi.listdatakpidetail', ['nokpstaff' => $nokpstaff, 'kodcaw' => $kodcaw])
                 ->with('success', 'Data '.$kodcaw.' Berjaya Dihapuskan');
         }
     }
-
-    
 }

app/Http/Controllers/LelongUjrahController.php

@@ -2,21 +2,19 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Carbon\Carbon;
-use App\Models\Simulasi;
-use App\Models\CawanganSimulasi;
-use App\Models\SimKarat;
-use App\Models\Lelong;
-use App\Models\LelKarat;
 use App\Models\CawanganLelong;
-use App\Models\SimulasiBid;
+use App\Models\CawanganSimulasi;
+use App\Models\LelKarat;
+use App\Models\Lelong;
 use App\Models\LelongBid;
-use App\Models\SimulasiBidMarhun;
 use App\Models\LelongBidMarhun;
 use App\Models\LogUser;
-use DateTime;
+use App\Models\SimKarat;
+use App\Models\Simulasi;
+use App\Models\SimulasiBid;
+use App\Models\SimulasiBidMarhun;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Auth;
 
 class LelongUjrahController extends Controller
 {
@@ -35,10 +33,8 @@ class LelongUjrahController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function index()
+    public function index() {}
-    {
 
-    }
     public function create($id)
     {
         $user = Auth::user();
@@ -48,8 +44,7 @@ class LelongUjrahController extends Controller
         $cawangansim = CawanganSimulasi::where('simulasi_id', '=', $id)->get();
         $simkarat = SimKarat::where('simulasi_id', '=', $id)->get();
 
-
+        $lelong = new Lelong;
-        $lelong = new Lelong();
         $lelong->tarikh_lelong = $simulasi->tarikh_lelong;
         $lelong->harga_emas_asas = $simulasi->harga_emas_asas;
         $lelong->jbg = $simulasi->jbg;
@@ -59,9 +54,7 @@ class LelongUjrahController extends Controller
         $lelong->tagujrah = 1;
         $lelong->save();
 
-
+        foreach ($simkarat as $simulasikarat) {
-        foreach($simkarat as $simulasikarat)
-        {
             $lelkarat = new LelKarat;
             $lelkarat->lelong_id = $lelong->id;
             $lelkarat->karat = $simulasikarat->karat;
@@ -71,15 +64,11 @@ class LelongUjrahController extends Controller
             $lelkarat->save();
         }
 
-        foreach($cawangansim as $caw)
+        foreach ($cawangansim as $caw) {
-        {
             $cawanganlel = CawanganLelong::where('caw_id', '=', $caw->caw_id)->orderBy('id', 'desc')->first();
-            if($cawanganlel)
+            if ($cawanganlel) {
-            {
                 $batchno = $cawanganlel->batchlel + 1;
-            }
+            } else {
-            else
-            {
                 $batchno = 1;
             }
             $caw_lelong = new CawanganLelong;
@@ -95,46 +84,42 @@ class LelongUjrahController extends Controller
 
             $datasimbid = SimulasiBid::where('caw_id', '=', $caw->caw_id)->where('simulasi_id', $id)->get();
             $suratcaw = $datasimbid->all();
-                foreach(array_chunk($suratcaw,100) as $data_chunk)
+            foreach (array_chunk($suratcaw, 100) as $data_chunk) {
-                {
                 // dd($data);
-                    foreach($data_chunk as $data)
+                foreach ($data_chunk as $data) {
-                   {
                     // dd($simulasi->id);
                     $lelongbid = LelongBid::create([
-                                "lelong_id" => $lelong->id,
+                        'lelong_id' => $lelong->id,
-                                "caw_id" => $data->caw_id,
+                        'caw_id' => $data->caw_id,
-                                "kodcaw" => $data->kodcaw,
+                        'kodcaw' => $data->kodcaw,
-                                "norujukan" => $data->norujukan,
+                        'norujukan' => $data->norujukan,
-                                "t_lelong" => $data->t_lelong,
+                        't_lelong' => $data->t_lelong,
-                                "hargaasas" => $data->hargaasas,
+                        'hargaasas' => $data->hargaasas,
-                                "hargajual" => 0.00,
+                        'hargajual' => 0.00,
-                                "jbg" => $data->jbg,
+                        'jbg' => $data->jbg,
-                                "kadarupah" => $data->kadarupah,
+                        'kadarupah' => $data->kadarupah,
-                                "ansuran" => $data->ansuran,
+                        'ansuran' => $data->ansuran,
-                                "nilaimarhun" => $data->nilaimarhun,
+                        'nilaimarhun' => $data->nilaimarhun,
-                                "pinjaman" => $data->pinjaman,
+                        'pinjaman' => $data->pinjaman,
-                                "bakiupah" => $data->bakiupah,
+                        'bakiupah' => $data->bakiupah,
-                                "upahsimpan" => $data->bakiupah,
+                        'upahsimpan' => $data->bakiupah,
-                                "cajlain" =>  $data->cajlain,
+                        'cajlain' => $data->cajlain,
-                                "cajlelong" => 0.00,
+                        'cajlelong' => 0.00,
-                                "baki" => 0.00,
+                        'baki' => 0.00,
-                                "berat" => $data->berat,
+                        'berat' => $data->berat,
-                                "marhun" => $data->marhun,
+                        'marhun' => $data->marhun,
-                                "percent" => $data->percent,
+                        'percent' => $data->percent,
-                                "status_jual" => 0,
+                        'status_jual' => 0,
-                                "status_payment" => 0,
+                        'status_payment' => 0,
-                                "mora_upah" => 0,
+                        'mora_upah' => 0,
-                                "fasa" => $data->fasa,
+                        'fasa' => $data->fasa,
-                                "tagujrah" => 1,
+                        'tagujrah' => 1,
-                                "onepercent" => $data->onepercent,
+                        'onepercent' => $data->onepercent,
-                                "ujrah" => $data->ujrah
+                        'ujrah' => $data->ujrah,
                     ]);
 
-
                     $simulasibidmarhun = SimulasiBidMarhun::where('simulasibid_id', '=', $data->id)->get();
-                        foreach($simulasibidmarhun as $simbidmarhun)
+                    foreach ($simulasibidmarhun as $simbidmarhun) {
-                        {
                         $lelongbidmarhun = new LelongBidMarhun;
                         $lelongbidmarhun->lelongbid_id = $lelongbid->id;
                         $lelongbidmarhun->bil = $simbidmarhun->bil;
@@ -155,8 +140,7 @@ class LelongUjrahController extends Controller
 
                     }
 
-                        if($lelongbidmarhun->save())
+                    if ($lelongbidmarhun->save()) {
-                        {
                         // $updategadai = Gadai::where('norujukan','=', $data->norujukan)->first();
                         // $updategadai->taglel = 1;
                         // $updategadai->save();
@@ -175,11 +159,9 @@ class LelongUjrahController extends Controller
                         $loguser->save();
                     }
 
-
                 }
             }
 
-
         }
         $simulasi = Simulasi::where('id', '=', $id)->where('tagujrah', 1)->first();
         // dd($role);
@@ -189,6 +171,4 @@ class LelongUjrahController extends Controller
             ->with('success', 'Pendaftaran Lelong Berjaya');
 
     }
-
-    
 }

app/Http/Controllers/LogoutController.php

@@ -3,18 +3,8 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-use Spatie\Permission\Models\Role;
-use Spatie\Permission\Models\Permission;
 use Illuminate\Support\Facades\Auth;
 
-
-use App\Models\Lelong;
-use App\Models\CawanganLelong;
-use App\Models\Pengesahan;
-use Carbon\Carbon;
-use App\Models\Cawangan;
-use App\Models\LelongBid;
-use Hash;
 // use Auth;
 
 class LogoutController extends Controller
@@ -34,8 +24,10 @@ class LogoutController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-    public function logout(Request $request) {
+    public function logout(Request $request)
+    {
         Auth::logout();
+
         return redirect()->route('login');
     }
 }

app/Http/Controllers/MailController.php

@@ -1,32 +1,33 @@
 <?php
+
 namespace App\Http\Controllers;
-use Illuminate\Http\Request;
+
-use Illuminate\Support\Facades\Mail;
 use App\Mail\notislelong;
-use Symfony\Component\HttpFoundation\Response;
 use App\Models\User;
+use Illuminate\Support\Facades\Mail;
+use Symfony\Component\HttpFoundation\Response;
 
-class MailController extends Controller {
+class MailController extends Controller
-    
+{
-    public function sendEmail() {
+    public function sendEmail()
+    {
 
         $users = User::where('user_type', 2)
             ->get();
 
-        foreach($users as $user)
+        foreach ($users as $user) {
-        {
             $email = $user->email;
 
             $mailData = [
                 'title' => 'Notis Lelongan Gadaian',
-                'url' => 'https://www.positronx.io' // show unpaid gadaian
+                'url' => 'https://www.positronx.io', // show unpaid gadaian
             ];
 
             Mail::to($email)->send(new notislelong($mailData));
         }
 
         return response()->json([
-            'message' => 'Email has been sent.'
+            'message' => 'Email has been sent.',
         ], Response::HTTP_OK);
     }
 }

app/Http/Controllers/MarhunController.php

@@ -2,37 +2,32 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Support\Facades\Http;
-use Illuminate\Http\Request;
-use Spatie\Permission\Models\Role;
-use Spatie\Permission\Models\Permission;
-use Illuminate\Support\Facades\Auth;
-use App\Models\User;
-use PDF;
 use App\Models\Cawangan;
-use App\Models\JenisEmas;
-use App\Models\JenisKarat;
-use App\Models\Gadai;
-use App\Models\Lelong;
 use App\Models\CawanganLelong;
 use App\Models\FileMarhun;
-use App\Models\LelongBid;
-use App\Models\LelongBidMarhun;
-use App\Models\LelKarat;
-use App\Models\LelKarat_temp;
-use App\Models\Pengesahan;
 use App\Models\GadaiMarhun;
+use App\Models\JenisEmas;
+use App\Models\JenisKarat;
+use App\Models\LelKarat;
+use App\Models\Lelong;
+use App\Models\LelongBid;
 use App\Models\LelongBidder;
+use App\Models\LelongBidMarhun;
+use App\Models\LogUser;
+use App\Models\Pengesahan;
+use App\Models\ScanJual;
 use App\Models\ScanSemak;
 use App\Models\TangguhLelong;
-use Carbon\Carbon;
-use App\Models\ScanJual;
-use App\Services\MarhunPhotoService;
-use Illuminate\Support\Facades\Request as FacadesRequest;
 use App\Models\TempPengesahan;
+use App\Models\User;
+use App\Services\MarhunPhotoService;
+use Carbon\Carbon;
 use DateTime;
-use App\Models\LogUser;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Storage;
+use PDF;
 
 class MarhunController extends Controller
 {
@@ -62,8 +57,6 @@ class MarhunController extends Controller
 
         $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
 
-       
-        
         // dd($lelongbid);
 
         $sag = LelongBid::where('lelong_id', $lelong_id) // belum disemak
@@ -134,7 +127,6 @@ class MarhunController extends Controller
             ->get();
         foreach ($lelongbid as $index1 => $bid) {
 
-
             $statusdrpdpc = Pengesahan::where('lelongbid_id', $bid['id'])
                 ->where('lelong_id', $lelong_id)
                 ->where('status_ubah', 6)
@@ -180,16 +172,13 @@ class MarhunController extends Controller
 
             // }
 
-
             $marhun = LelongBidMarhun::where('lelongbid_id', '=', $bid['id'])
                 ->get()
                 ->toArray();
             $lelongbid[$index1]['marhun'] = $marhun;
 
-           
             // dd($status);
 
-
             // $index->status = $status;
         }
         // dd($sudahdisahkan);
@@ -250,7 +239,7 @@ class MarhunController extends Controller
                 $pengesahan->status_ubah = 5;
                 $pengesahan->save();
             } else {
-                $berat = new Pengesahan();
+                $berat = new Pengesahan;
                 $berat->lelong_id = $lelong->id;
                 $berat->lelongbid_id = $lelongbid->id;
                 $berat->lelongbidmarhun_id = $marhun->id;
@@ -284,7 +273,7 @@ class MarhunController extends Controller
                 $pengesahan->status_ubah = 1;
                 $pengesahan->save();
             } else {
-                $karat = new Pengesahan();
+                $karat = new Pengesahan;
                 $karat->lelong_id = $lelong->id;
                 $karat->lelongbid_id = $lelongbid->id;
                 $karat->lelongbidmarhun_id = $marhun->id;
@@ -322,7 +311,7 @@ class MarhunController extends Controller
                 $pengesahan->status_ubah = 4;
                 $pengesahan->save();
             } else {
-                $berat = new Pengesahan();
+                $berat = new Pengesahan;
                 $berat->lelong_id = $lelong->id;
                 $berat->lelongbid_id = $lelongbid->id;
                 $berat->lelongbidmarhun_id = $marhun->id;
@@ -389,8 +378,7 @@ class MarhunController extends Controller
             $pengesahan->save();
             // dd($pengesahan);
 
-        }
+        } elseif ($lelongBidMarhun->karat != $request->karat && $lelongBidMarhun->marhun != $request->marhun) {
-        else if($lelongBidMarhun->karat != $request->karat && $lelongBidMarhun->marhun != $request->marhun) {
             $pengesahan = new Pengesahan;
             $pengesahan->lelong_id = $lelong->id;
             $pengesahan->lelongbid_id = $lelongbid->id;
@@ -404,8 +392,7 @@ class MarhunController extends Controller
             $pengesahan->save();
             // dd($pengesahan);
 
-        }
+        } elseif ($lelongBidMarhun->berat != $request->berat_emas && $lelongBidMarhun->marhun != $request->marhun) {
-        else if($lelongBidMarhun->berat != $request->berat_emas && $lelongBidMarhun->marhun != $request->marhun) {
             $pengesahan = new Pengesahan;
             $pengesahan->lelong_id = $lelong->id;
             $pengesahan->lelongbid_id = $lelongbid->id;
@@ -419,8 +406,7 @@ class MarhunController extends Controller
             $pengesahan->save();
             // dd($pengesahan);
 
-        }
+        } elseif ($lelongBidMarhun->berat != $request->berat_emas && $lelongBidMarhun->karat != $request->karat) {
-        else if ($lelongBidMarhun->berat != $request->berat_emas && $lelongBidMarhun->karat != $request->karat) {
             $pengesahan = new Pengesahan;
             $pengesahan->lelong_id = $lelong->id;
             $pengesahan->lelongbid_id = $lelongbid->id;
@@ -434,8 +420,7 @@ class MarhunController extends Controller
             $pengesahan->save();
             // dd($pengesahan);
 
-        }
+        } elseif ($lelongBidMarhun->berat != $request->berat_emas) {
-        else if ($lelongBidMarhun->berat != $request->berat_emas) {
             $pengesahan = new Pengesahan;
             $pengesahan->lelong_id = $lelong->id;
             $pengesahan->lelongbid_id = $lelongbid->id;
@@ -446,8 +431,7 @@ class MarhunController extends Controller
             $pengesahan->status_ubah = 4; // ubah berat
             $pengesahan->request_berat = $request->berat_emas;
             $pengesahan->save();
-        }
+        } elseif ($lelongBidMarhun->karat != $request->karat) {
-        else if ($lelongBidMarhun->karat != $request->karat) {
             $pengesahan = new Pengesahan;
             $pengesahan->lelong_id = $lelong->id;
             $pengesahan->lelongbid_id = $lelongbid->id;
@@ -459,7 +443,7 @@ class MarhunController extends Controller
             $pengesahan->request_karat = $request->karat;
             $pengesahan->save();
         } elseif ($lelongBidMarhun->marhun != $request->marhun) {
-            $pengesahan = new Pengesahan();
+            $pengesahan = new Pengesahan;
             $pengesahan->lelong_id = $lelong->id;
             $pengesahan->lelongbid_id = $lelongbid->id;
             $pengesahan->lelongbidmarhun_id = $lelongBidMarhun->id;
@@ -470,7 +454,7 @@ class MarhunController extends Controller
             $pengesahan->request_marhun = $request->marhun;
             $pengesahan->save();
         } elseif ($lelongBidMarhun->marhun > $request->marhun) {
-            $pengesahan = new Pengesahan();
+            $pengesahan = new Pengesahan;
             $pengesahan->lelong_id = $lelong->id;
             $pengesahan->lelongbid_id = $lelongbid->id;
             $pengesahan->lelongbidmarhun_id = $lelongBidMarhun->id;
@@ -567,7 +551,6 @@ class MarhunController extends Controller
                 ->first();
             // dd($status);
 
-
             $index->status = $status;
 
         }
@@ -575,6 +558,7 @@ class MarhunController extends Controller
         $lelkarat = LelKarat::where('lelong_id', '=', $lelongbid->lelong_id)->get();
         $karatall = JenisKarat::all();
         $emasall = JenisEmas::all();
+
         return view('marhun.marhun', compact('marhun', 'lelongbid', 'karatall', 'emasall', 'lelkarat', 'lelong_id', 'status'));
     }
 
@@ -687,7 +671,7 @@ class MarhunController extends Controller
         $lelongbid = LelongBid::where('norujukan', $request->norujukan_marhuntambahan)->first();
         $lelong = Lelong::where('id', '=', $lelongbid->lelong_id)->first();
 
-        $lelongbidmarhun = new LelongBidMarhun();
+        $lelongbidmarhun = new LelongBidMarhun;
         $lelongbidmarhun->lelongbid_id = $lelongbid->id;
         $lelongbidmarhun->bil = 1;
         $lelongbidmarhun->marhun = $request->marhuntambahan;
@@ -710,7 +694,7 @@ class MarhunController extends Controller
         $lelongbid->hargaasas = $lelongbid->hargaasas + $request->harga_asastambahan;
         $lelongbid->save();
 
-        $karat = new Pengesahan();
+        $karat = new Pengesahan;
         $karat->lelong_id = $lelong->id;
         $karat->lelongbid_id = $lelongbid->id;
         $karat->lelongbidmarhun_id = $lelongbidmarhun->id;
@@ -833,7 +817,6 @@ class MarhunController extends Controller
             ->whereIn('pengesahan.status_ubah', [1, 2, 3, 4, 5, 7, 8, 9, 10])
             ->select('lelong.fasa', 'pengesahan.lelong_id', 'lelong.id', 'lelong.tarikh_lelong', 'lelong.masatamat_lelong', 'lelong.harga_emas_asas', 'lelong.jbg', 'lelong.cajlelong', 'sts_lelong')
         // ->groupBy('pengesahan.lelong_id')
-       
             ->distinct()
             ->get()
             ->toArray();
@@ -1011,23 +994,19 @@ class MarhunController extends Controller
                             ->where('lelong_id', $id)
                             ->first();
                         $newhargaasas = round($getkaratnew['harga2'] * $marhun['berat']);
-                    }
+                    } elseif ($status->status_ubah == 4) {// jika berat berubah
-                    elseif($status->status_ubah == 4)//jika berat berubah
-                    {
                         $getkaratnew = LelKarat::where('karat', $marhun['karat'])
                                 ->where('lelong_id', $id)
                                 ->first();
                         $newhargaasas = round($status['request_berat'] * $marhun['harga']);
-                    }elseif ($status->status_ubah == 2) //jika add marhun
+                    } elseif ($status->status_ubah == 2) { // jika add marhun
-                    {
                         // dd($marhun['berat']);
                         $getkaratnew = LelKarat::where('karat', $marhun['karat'])
                             ->where('lelong_id', $id)
                             ->first();
                         $newhargaasas = round($marhun['berat'] * $marhun['harga']);
 
-                    }elseif ($status->status_ubah == 3) //jika hapus marhun
+                    } elseif ($status->status_ubah == 3) { // jika hapus marhun
-                    {
                         // dd($marhun['berat']);
                         $getkaratnew = LelKarat::where('karat', $marhun['karat'])
                             ->where('lelong_id', $id)
@@ -1080,6 +1059,7 @@ class MarhunController extends Controller
             array_push($arraylelbidmarhun, $marhuns);
             //  dd($arraylelbidmarhun);
         }
+
         // dd($lelbidmarhun->lelongbidmarhun_id);
         // dd($totalnewhargaasas);
         return view('pengesahan.mutumarhun', compact('lelongbid', 'norujukan', 'id', 'arraylelbidmarhun', 'marhuns', 'gadai'));
@@ -1125,7 +1105,6 @@ class MarhunController extends Controller
         $arraygadai = $lelbidmarhuns->pluck('norujukan')->toArray();
         $datagadai = $lelbidmarhuns;
 
-
         $gadai = GadaiMarhun::on($datagadai[0]['kodcaw'])->whereIn('norujukan', $arraygadai)
             ->get()->toArray();
 
@@ -1166,7 +1145,6 @@ class MarhunController extends Controller
                 ->where('lelongbid.lelong_id', $id)
                 ->first();
 
-
             $karat = Lelkarat::where('lelong_id', $id)->get();
 
             // dd($id);
@@ -1180,8 +1158,7 @@ class MarhunController extends Controller
                 // dd($status);
                 // dump($lelbidmarhun->lelongbidmarhun_id);
                 if ($status) {
-                    if($status->status_ubah == 8 )//jika mutu,berat dan marhun
+                    if ($status->status_ubah == 8) {// jika mutu,berat dan marhun
-                    {
                         // dd($status['request_karat']);
                         // if($status['request'])
                         $getkaratnew = LelKarat::where('karat', $status['request_karat'])
@@ -1190,9 +1167,7 @@ class MarhunController extends Controller
 
                         $newhargaasas = round($status['request_berat'] * $getkaratnew['harga2']);
                         // dump($lelbidmarhun->lelongbidmarhun_id);
-                    }
+                    } elseif ($status->status_ubah == 10) {// jika berat dan marhun
-                    else if($status->status_ubah == 10)//jika berat dan marhun
-                    {
                         // dd($status['request_karat']);
                         // if($status['request'])
                         $getkaratnew = LelKarat::where('karat', $marhun['karat'])
@@ -1201,9 +1176,7 @@ class MarhunController extends Controller
 
                         $newhargaasas = round($status['request_berat'] * $marhun['harga'], 1);
                         // dd($newhargaasas);
-                    }
+                    } elseif ($status->status_ubah == 9) {// jika mutu dan marhun
-                    else if($status->status_ubah == 9)//jika mutu dan marhun
-                    {
                         // dd($status['request_karat']);
                         // if($status['request'])
                         $getkaratnew = LelKarat::where('karat', $status['request_karat'])
@@ -1212,19 +1185,14 @@ class MarhunController extends Controller
 
                         $newhargaasas = round($marhun['berat'] * $getkaratnew['harga2']);
                         // dd($newhargaasas);
-                    }
+                    } elseif ($status->status_ubah == 7) { // jika ubah marhun
-                   
-                    elseif ($status->status_ubah == 7) //jika ubah marhun
-                    {
                         $getkaratnew = LelKarat::where('karat', $marhun['karat'])
                                 ->where('lelong_id', $id)
                                 ->first();
                         // dd($getkaratnew);
                         $newhargaasas = round($marhun['berat'] * $marhun['harga']);
                         // dd($newhargaasas);
-                    }
+                    } elseif ($status->status_ubah == 5) {// jika mutu dan berat berubah
-                    elseif($status->status_ubah == 5)//jika mutu dan berat berubah
-                    {
                         // dd($status['request_karat']);
                         // if($status['request'])
                         $getkaratnew = LelKarat::where('karat', $status['request_karat'])
@@ -1233,38 +1201,30 @@ class MarhunController extends Controller
 
                         $newhargaasas = round($status['request_berat'] * $getkaratnew['harga2']);
                         // dd($newhargaasas);
-                    }
+                    } elseif ($status->status_ubah == 1) {// jika karat berubah
-                    elseif($status->status_ubah == 1)//jika karat berubah
-                    {
                         $getkaratnew = LelKarat::where('karat', $status['request_karat'])
                                 ->where('lelong_id', $id)
                                 ->first();
                         $newhargaasas = round($getkaratnew['harga2'] * $marhun['berat']);
-                    }
+                    } elseif ($status->status_ubah == 4) {// jika berat berubah
-                    elseif($status->status_ubah == 4)//jika berat berubah
-                    {
                         $getkaratnew = LelKarat::where('karat', $marhun['karat'])
                                 ->where('lelong_id', $id)
                                 ->first();
                         $newhargaasas = round($status['request_berat'] * $marhun['harga']);
-                    }elseif ($status->status_ubah == 2) //jika add marhun
+                    } elseif ($status->status_ubah == 2) { // jika add marhun
-                    {
                         // dd($marhun['berat']);
                         $getkaratnew = LelKarat::where('karat', $marhun['karat'])
                             ->where('lelong_id', $id)
                             ->first();
                         $newhargaasas = round($marhun['berat'] * $marhun['harga']);
 
-                    }elseif ($status->status_ubah == 3) //jika hapus marhun
+                    } elseif ($status->status_ubah == 3) { // jika hapus marhun
-                    {
                         // dd($marhun['berat']);
                         $getkaratnew = LelKarat::where('karat', $marhun['karat'])
                             ->where('lelong_id', $id)
                             ->first();
                         $newhargaasas = 0.00;
-                    }
+                    } else {
-                    else
-                    {
                         $getkaratnew = LelKarat::where('karat', $marhun['karat'])
                             ->where('lelong_id', $id)
                             ->first();
@@ -1272,8 +1232,7 @@ class MarhunController extends Controller
                     }
 
                     $marhuns[$index1]['status_ubah'] = $status;
-                }
+                } else { // jika tiada $status
-                else{ //jika tiada $status
                     $getkaratnew = LelKarat::where('karat', $marhun['karat'])
                         ->where('lelong_id', $id)
                         ->first();
@@ -1281,7 +1240,6 @@ class MarhunController extends Controller
                 }
                 // dump($newhargaasas);
 
-               
                 $totalnewhargaasas = $totalnewhargaasas + $newhargaasas;
                 $lelong = Lelong::where('id', $id)->get();
                 $sumcajlelong = $totalnewhargaasas * ($lelong[0]['cajlelong'] / 100);
@@ -1312,14 +1270,13 @@ class MarhunController extends Controller
             array_push($arraylelbidmarhun, $marhuns);
             //  dd($arraylelbidmarhun);
 
-            
         }
+
         // dd($lelbidmarhun->lelongbidmarhun_id);
         // dd($totalnewhargaasas);
         return view('marhun.lihatubahmutumarhun', compact('lelongbid', 'norujukan', 'id', 'arraylelbidmarhun', 'marhuns', 'gadai'));
     }
 
-
     public function terimaperubahan(Request $request)
     {
         // update mutu marhun - gadaimarhun
@@ -1373,8 +1330,7 @@ class MarhunController extends Controller
                     $updatemarhun->hargaasas = $hargaasasnew;
                     $updatemarhun->update();
 
-                    } else if ($terimalel->status_ubah == 4) //ubah berat
+                } elseif ($terimalel->status_ubah == 4) { // ubah berat
-                    {
                     $getkarat = LelKarat::where('karat', $lelongbidmarhuns->old_karat)
                             ->where('lelong_id', $request->lelong_id)
                             ->first();
@@ -1387,8 +1343,7 @@ class MarhunController extends Controller
                     $updatemarhun->n_marhun = $nilaimarhunnew;
                     $updatemarhun->hargaasas = $hargaasasnew;
                     $updatemarhun->save();
-                    } else if ($terimalel->status_ubah == 5) //ubah mutu dan berat
+                } elseif ($terimalel->status_ubah == 5) { // ubah mutu dan berat
-                    {
                     $getkarat = LelKarat::where('karat', $terimalel->request_karat)
                             ->where('lelong_id', $request->lelong_id)
                             ->first();
@@ -1403,9 +1358,7 @@ class MarhunController extends Controller
                     $updatemarhun->n_marhun = $nilaimarhunnew;
                     $updatemarhun->hargaasas = $hargaasasnew;
                     $updatemarhun->save();
-                    } 
+                } elseif ($terimalel->status_ubah == 7) { // ubah marhun
-                    else if ($terimalel->status_ubah == 7) //ubah marhun
-                    {
                     $getkarat = LelKarat::where('karat', $lelongbidmarhuns->karat)
                             ->where('lelong_id', $request->lelong_id)
                             ->first();
@@ -1419,9 +1372,7 @@ class MarhunController extends Controller
                     $updatemarhun->n_marhun = $nilaimarhunnew;
                     $updatemarhun->hargaasas = $hargaasasnew;
                     $updatemarhun->save();
-                    }
+                } elseif ($terimalel->status_ubah == 8) { // ubah mutu dan berat dan marhun
-                    else if ($terimalel->status_ubah == 8) //ubah mutu dan berat dan marhun
-                    {
                     $getkarat = LelKarat::where('karat', $terimalel->request_karat)
                             ->where('lelong_id', $request->lelong_id)
                             ->first();
@@ -1437,9 +1388,7 @@ class MarhunController extends Controller
                     $updatemarhun->n_marhun = $nilaimarhunnew;
                     $updatemarhun->hargaasas = $hargaasasnew;
                     $updatemarhun->save();
-                    }
+                } elseif ($terimalel->status_ubah == 9) { // ubah mutu dan marhun
-                    else if ($terimalel->status_ubah == 9) //ubah mutu dan marhun
-                    {
                     $getkarat = LelKarat::where('karat', $terimalel->request_karat)
                             ->where('lelong_id', $request->lelong_id)
                             ->first();
@@ -1454,9 +1403,7 @@ class MarhunController extends Controller
                     $updatemarhun->n_marhun = $nilaimarhunnew;
                     $updatemarhun->hargaasas = $hargaasasnew;
                     $updatemarhun->save();
-                    }
+                } elseif ($terimalel->status_ubah == 10) { // ubah berat dan marhun
-                    else if ($terimalel->status_ubah == 10) //ubah berat dan marhun
-                    {
                     $getkarat = LelKarat::where('karat', $lelongbidmarhuns->karat)
                             ->where('lelong_id', $request->lelong_id)
                             ->first();
@@ -1471,9 +1418,7 @@ class MarhunController extends Controller
                     $updatemarhun->n_marhun = $nilaimarhunnew;
                     $updatemarhun->hargaasas = $hargaasasnew;
                     $updatemarhun->save();
-                    }
+                } elseif ($terimalel->status_ubah == 2) { // tambah marhun
-                    else if ($terimalel->status_ubah == 2) //tambah marhun
-                    {
                     $getkarat = LelKarat::where('karat', $lelongbidmarhuns->karat)
                             ->where('lelong_id', $request->lelong_id)
                             ->first();
@@ -1532,8 +1477,7 @@ class MarhunController extends Controller
                     $loguser->norujukan = $request->norujukan;
                     $loguser->nota = 'Tidak Sah Tambah Marhun';
                     $loguser->save();
-                }
+                } else {
-                else{
                     $deletepengesahan = Pengesahan::where('lelongbid_id', $request->lelongbid_id)
                         ->where('lelong_id', $request->lelong_id)
                         ->where('norujukan', $request->norujukan)
@@ -1590,7 +1534,7 @@ class MarhunController extends Controller
             $id = $request->lelongbid_id;
             $lelong_id = $marhun->lelong_id;
 
-            $pengesahan = new Pengesahan();
+            $pengesahan = new Pengesahan;
             $pengesahan->lelong_id = $marhun->lelong_id;
             $pengesahan->lelongbid_id = $request->lelongbid_id;
             $pengesahan->lelongbidmarhun_id = $request->lelongbidmarhun_id;
@@ -1770,7 +1714,6 @@ class MarhunController extends Controller
             ->orderBy('norujukan', 'asc')
             ->get();
 
-       
         // dd($sedangDinilai->norujukan);
 
         if ($senaraiScanKeluar || $sedangDinilai || $sudahSerah) {
@@ -1793,6 +1736,7 @@ class MarhunController extends Controller
             $terimaMarhun->terima_marhun = $current->toDateTimeString();
             $terimaMarhun->update();
         }
+
         return redirect()
             ->route('marhun.terimaserahmarhun', $terimaMarhun->lelong_id)
             ->with('success', 'Terima Marhun Berjaya Direkodkan');
@@ -1808,6 +1752,7 @@ class MarhunController extends Controller
             $serahMarhun->serah_marhun = $current->toDateTimeString();
             $serahMarhun->update();
         }
+
         return redirect()
             ->route('marhun.terimaserahmarhun', $serahMarhun->lelong_id)
             ->with('success', 'Serah Marhun Berjaya Direkodkan');
@@ -1879,10 +1824,11 @@ class MarhunController extends Controller
             ->get();
 
         if ($checkExisting->isEmpty()) {
-            $lelongbidItem = LelongBid::where('norujukan', '=', $request->norujukan_barcode)->first();
+            $lelongbidItem = LelongBid::where('norujukan', '=', $request->norujukan_barcode)
+                ->where('lelong_id', $request->lelong_id)
+                ->first();
 
-            if($lelongbidItem->lelong_id != $request->lelong_id)
+            if (! $lelongbidItem) {
-            {
                 return redirect()
                     ->route('marhun.scanbarcode', $request->lelong_id)
                     ->with('failed', 'Marhun Di Scan Pada Batch Lelong Berlainan. Sila Semak Semula.');
@@ -1890,7 +1836,7 @@ class MarhunController extends Controller
 
             $pengesahan = Pengesahan::where('norujukan', $lelongbidItem['norujukan'])->first();
             if ($pengesahan) {
-                $addpengesahan = new TempPengesahan();
+                $addpengesahan = new TempPengesahan;
                 $addpengesahan->lelong_id = $pengesahan->lelong_id;
                 $addpengesahan->lelongbid_id = $pengesahan->lelongbid_id;
                 $addpengesahan->lelongbidmarhun_id = $pengesahan->lelongbidmarhun_id;
@@ -1911,7 +1857,7 @@ class MarhunController extends Controller
                 ->where('norujukan', $lelongbidItem['norujukan'])
                 ->delete();
 
-            $scanKeluar = new ScanSemak();
+            $scanKeluar = new ScanSemak;
             $scanKeluar->kodcaw = $lelongbidItem['kodcaw'];
             $scanKeluar->lelong_id = $lelongbidItem['lelong_id'];
             $scanKeluar->lelongbid_id = $lelongbidItem['id'];
@@ -1923,9 +1869,6 @@ class MarhunController extends Controller
             $lelongbidItem->status_semak = 0;
             $lelongbidItem->save();
 
-          
-
-
             return redirect()->route('marhun.scanbarcode', $request->lelong_id)
                 ->with('success', 'Marhun Berjaya Di Scan Keluar Dari Peti Besi.');
         } else {
@@ -1950,6 +1893,7 @@ class MarhunController extends Controller
         if ($scanMasuk) {
             $scanMasuk->scan_masuk = $current->toDateTimeString();
             $scanMasuk->update();
+
             return redirect()->route('marhun.scanbarcodemasuk', $request->lelong_id)
                 ->with('success', 'Marhun Berjaya Di Scan Masuk Ke Peti Besi.');
         } else {
@@ -1960,6 +1904,14 @@ class MarhunController extends Controller
 
     public function addPhotoMarhun(Request $request)
     {
+        $request->validate([
+            'gambarMarhun' => 'required|file|mimes:jpg,jpeg,png,webp,gif|max:10240',
+        ], [
+            'gambarMarhun.required' => 'Sila pilih fail gambar.',
+            'gambarMarhun.mimes' => 'Fail mestilah imej (JPG, PNG, WEBP, GIF) sahaja.',
+            'gambarMarhun.max' => 'Saiz fail melebihi 10MB.',
+        ]);
+
         $this->marhunPhotoService->store($request);
 
         return redirect()
@@ -1978,6 +1930,14 @@ class MarhunController extends Controller
 
     public function updatePhotoMarhun(Request $request)
     {
+        $request->validate([
+            'gambarMarhun' => 'required|file|mimes:jpg,jpeg,png,webp,gif|max:10240',
+        ], [
+            'gambarMarhun.required' => 'Sila pilih fail gambar.',
+            'gambarMarhun.mimes' => 'Fail mestilah imej (JPG, PNG, WEBP, GIF) sahaja.',
+            'gambarMarhun.max' => 'Saiz fail melebihi 10MB.',
+        ]);
+
         $this->marhunPhotoService->delete($request);
         $this->marhunPhotoService->store($request);
 
@@ -2067,6 +2027,7 @@ class MarhunController extends Controller
 
         return $pdf->download('Senarai Masuk Peti Besi.pdf');
     }
+
     public function cetakterimaserahmarhun($lelong_id)
     {
         $user = Auth::user();
@@ -2094,6 +2055,7 @@ class MarhunController extends Controller
         if ($senaraiScanKeluar || $sedangDinilai || $sudahSerah) {
             // return view('pdf.cetakterimaserahmarhun', compact('senaraiScanKeluar', 'sedangDinilai', 'sudahSerah','lelong_id','caw'));
             $pdf = PDF::loadView('pdf.cetakterimaserahmarhun', compact('senaraiScanKeluar', 'sedangDinilai', 'sudahSerah', 'lelong_id', 'caw'))->setPaper('a4', 'potrait');
+
             return $pdf->download('Laporan Serahan Marhun.pdf');
         } else {
             return redirect()
@@ -2125,11 +2087,9 @@ class MarhunController extends Controller
 
         $lelongAll = Lelong::with('cawangan')->get();
 
-
         if ($lelong) {
 
-        foreach ($lelong as $info) 
+            foreach ($lelong as $info) {
-        {
                 $lelong_id = $info['lelong_id'];
 
                 $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
@@ -2141,7 +2101,6 @@ class MarhunController extends Controller
                     ->groupBy('lelongbidder.user_id')
                     ->get()->toArray();
 
-           
                 foreach ($listwinner as $index1 => $winner) {
 
                     $userdetails = User::where('id', $winner['user_id'])->first();
@@ -2173,8 +2132,6 @@ class MarhunController extends Controller
         //     }
         // }
 
-
-
         return view('marhun.senarailelongscanjual', compact('lelong', 'arrayinfo', 'arraydetails0', 'arraydetails1', 'lelongAll'));
     }
 
@@ -2207,8 +2164,7 @@ class MarhunController extends Controller
             ->get()
             ->keyBy('id');
         foreach ($lelongbid as $index => $value) {
-            $namabidder = LelongBidder::
+            $namabidder = LelongBidder::where('lelongbid_id', '=', $value['id'])
-            where('lelongbid_id', '=',  $value['id'])
             // ->where('lelongbid.kodcaw', '=', $user->kodcaw)
                 ->where('lelongbidder.status_bidder', '=', '1')
                 ->select('lelongbidder.lelongbid_id', 'lelongbidder.nama_bidder')
@@ -2234,6 +2190,7 @@ class MarhunController extends Controller
 
         return view('marhun.scanbarcodejual', compact('namabidder', 'new_lelong_bid', 'lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar'));
     }
+
     public function scanKeluarMarhunjual(Request $request)
     {
         $user = Auth::user();
@@ -2244,9 +2201,17 @@ class MarhunController extends Controller
             ->get();
 
         if ($checkExisting->isEmpty()) {
-            $lelongbidItem = LelongBid::where('norujukan', '=', $request->norujukan_barcode)->first();
+            $lelongbidItem = LelongBid::where('norujukan', '=', $request->norujukan_barcode)
+                ->where('lelong_id', $request->lelong_id)
+                ->first();
 
-            $scanKeluar = new ScanSemak();
+            if (! $lelongbidItem) {
+                return redirect()
+                    ->route('marhun.scanbarcodejual', $request->lelong_id)
+                    ->with('failed', 'Marhun Di Scan Pada Batch Lelong Berlainan. Sila Semak Semula.');
+            }
+
+            $scanKeluar = new ScanSemak;
             $scanKeluar->kodcaw = $lelongbidItem['kodcaw'];
             $scanKeluar->lelong_id = $lelongbidItem['lelong_id'];
             $scanKeluar->lelongbid_id = $lelongbidItem['id'];
@@ -2256,7 +2221,7 @@ class MarhunController extends Controller
             $scanKeluar->serahkpdpembida = 1;
             $scanKeluar->save();
 
-            $scanJualKeluar = new ScanJual();
+            $scanJualKeluar = new ScanJual;
             $scanJualKeluar->kodcaw = $lelongbidItem['kodcaw'];
             $scanJualKeluar->lelong_id = $lelongbidItem['lelong_id'];
             $scanJualKeluar->lelongbid_id = $lelongbidItem['id'];
@@ -2312,24 +2277,20 @@ class MarhunController extends Controller
     {
         $auth_user = Auth::user();
         $current = Carbon::now();
-        $current = new Carbon();
+        $current = new Carbon;
         $tarikh_cetak = $current->toDateString();
         // dd($request->datehingga);
 
-      
-      
         $myDateTime = DateTime::createFromFormat('Y-m-d', $request->datehingga);
         $datez = $myDateTime->modify('+1 day')->format('Y-m-d');
         $request->datehingga = $datez;
 
-
         $kodcaw = $auth_user['kodcaw'];
 
         $cawangan = Cawangan::where('caw_code', '=', $kodcaw)
             ->first();
 
-        if($request->jenis == 'keluar')
+        if ($request->jenis == 'keluar') {
-        {
             $scan = ScanSemak::where('scan_semak.kodcaw', '=', $kodcaw)
                 ->join('users', 'scan_semak.khazanah_id', '=', 'users.id')
                 ->where('scan_keluar', '>=', $request->datemula)
@@ -2338,9 +2299,7 @@ class MarhunController extends Controller
 
             return view('pdf.laporanscankeluar', compact('scan', 'auth_user', 'tarikh_cetak', 'cawangan'));
 
-        }
+        } elseif ($request->jenis == 'masuk') {
-        
-        else if($request->jenis == 'masuk'){
 
             $scan = ScanSemak::join('users', 'scan_semak.khazanah_id', '=', 'users.id')
                 ->where('scan_semak.kodcaw', '=', $kodcaw)
@@ -2377,7 +2336,6 @@ class MarhunController extends Controller
             return view('pdf.laporanscanserahpembida', compact('scan', 'auth_user', 'tarikh_cetak', 'cawangan'));
         }
 
-
     }
 
     public function senaraiterimaserah(Request $request)
@@ -2393,7 +2351,7 @@ class MarhunController extends Controller
     {
         $auth_user = Auth::user();
         $current = Carbon::now();
-        $current = new Carbon();
+        $current = new Carbon;
         $tarikh_cetak = $current->toDateString();
 
         if ($request->datemula == null) {
@@ -2435,6 +2393,7 @@ class MarhunController extends Controller
     public function showPhotoMarhun(Request $request)
     {
         $marhun = FileMarhun::where('id', '=', $request->filemarhun_id)->first();
+
         return $this->marhunPhotoService->show($request->norujukan_sag, $marhun);
     }
 
@@ -2476,7 +2435,6 @@ class MarhunController extends Controller
         }
         // dd( $total_berat );
 
-
         array_push($arraycaw, [
             'berat' => $berat,
             'harga' => $harga,
@@ -2503,8 +2461,7 @@ class MarhunController extends Controller
             ->get()
             ->keyBy('id');
         foreach ($lelongbid as $index => $value) {
-            $namabidder = LelongBidder::
+            $namabidder = LelongBidder::where('lelongbid_id', '=', $value['id'])
-            where('lelongbid_id', '=',  $value['id'])
             // ->where('lelongbid.kodcaw', '=', $user->kodcaw)
                 ->where('lelongbidder.status_bidder', '=', '1')
                 ->where('user_id', '=', $userid)
@@ -2541,7 +2498,6 @@ class MarhunController extends Controller
         return view('marhun.scanbarcodejualbycust', compact('userid', 'userdetails', 'namabidder', 'new_lelong_bid', 'lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar'));
     }
 
-
     public function scanKeluarMarhunjualbycust(Request $request)
     {
         $user = Auth::user();
@@ -2552,9 +2508,17 @@ class MarhunController extends Controller
             ->get();
 
         if ($checkExisting->isEmpty()) {
-            $lelongbidItem = LelongBid::where('norujukan', '=', $request->norujukan_barcode)->first();
+            $lelongbidItem = LelongBid::where('norujukan', '=', $request->norujukan_barcode)
+                ->where('lelong_id', $request->lelong_id)
+                ->first();
 
-            $scanKeluar = new ScanSemak();
+            if (! $lelongbidItem) {
+                return redirect()
+                    ->route('marhun.scanbarcodejualbycust', ['lelong_id' => $request->lelong_id, 'userid' => $request->userid])
+                    ->with('failed', 'Marhun Di Scan Pada Batch Lelong Berlainan. Sila Semak Semula.');
+            }
+
+            $scanKeluar = new ScanSemak;
             $scanKeluar->kodcaw = $lelongbidItem['kodcaw'];
             $scanKeluar->lelong_id = $lelongbidItem['lelong_id'];
             $scanKeluar->lelongbid_id = $lelongbidItem['id'];
@@ -2564,7 +2528,7 @@ class MarhunController extends Controller
             $scanKeluar->serahkpdpembida = 1;
             $scanKeluar->save();
 
-            $scanJualKeluar = new ScanJual();
+            $scanJualKeluar = new ScanJual;
             $scanJualKeluar->kodcaw = $lelongbidItem['kodcaw'];
             $scanJualKeluar->lelong_id = $lelongbidItem['lelong_id'];
             $scanJualKeluar->lelongbid_id = $lelongbidItem['id'];
@@ -2621,10 +2585,9 @@ class MarhunController extends Controller
     public function pengurusanGambarMarhun()
     {
         $lelong_all = Lelong::select('id', 'tarikh_lelong', 'fasa')->get();
-        foreach($lelong_all as $index => $lelong)
+        foreach ($lelong_all as $index => $lelong) {
-        {
             $date_convert = strtotime($lelong->tarikh_lelong);
-            $lelong_all[$index]['tarikh_lelong'] = date("d-m-Y", $date_convert);
+            $lelong_all[$index]['tarikh_lelong'] = date('d-m-Y', $date_convert);
         }
 
         return view('pengurusangambar.operasi', compact('lelong_all'));
@@ -2638,11 +2601,10 @@ class MarhunController extends Controller
 
         $caw_id = $cawangan->id;
         $lelong_all = $cawangan->lelong;
-        foreach($lelong_all as $index => $lelong)
+        foreach ($lelong_all as $index => $lelong) {
-        {
             $date_convert = strtotime($lelong->tarikh_lelong);
-            $lelong_all[$index]['tarikh_lelong'] = date("d-m-Y", $date_convert);
+            $lelong_all[$index]['tarikh_lelong'] = date('d-m-Y', $date_convert);
-            $lelong_all[$index]['new_id'] = str_pad($lelong->id, 3, "0", STR_PAD_LEFT);
+            $lelong_all[$index]['new_id'] = str_pad($lelong->id, 3, '0', STR_PAD_LEFT);
         }
 
         return view('pengurusangambar.cawangan', compact('caw_id', 'lelong_all'));
@@ -2653,6 +2615,7 @@ class MarhunController extends Controller
         $cawangan_all = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
             ->where('lelong_id', $request->lelong_id)
             ->select('cawangan_lelong.caw_id', 'cawangan.caw_name')->get();
+
         return response()->json($cawangan_all);
     }
 
@@ -2688,9 +2651,9 @@ class MarhunController extends Controller
         $belum_semak = $lelong_bid_all->where('status_semak', 0)->count();
 
         return response()->json([
-            "jumlah_surat" => $lelong_bid_all->count(),
+            'jumlah_surat' => $lelong_bid_all->count(),
-            "belum_semak" => $belum_semak,
+            'belum_semak' => $belum_semak,
-            "lelong_bid" => $lelong_bid_all,
+            'lelong_bid' => $lelong_bid_all,
         ]);
     }
 }

app/Http/Controllers/Mobile/EmailVerificationController.php

@@ -2,19 +2,18 @@
 
 namespace App\Http\Controllers\Mobile;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use Illuminate\Auth\Events\Verified;
 use Illuminate\Foundation\Auth\EmailVerificationRequest;
+use Illuminate\Http\Request;
 
 class EmailVerificationController extends Controller
 {
-
     public function sendVerificationEmail(Request $request)
     {
         if ($request->user()->hasVerifiedEmail()) {
             return [
-                'message' => 'Already Verified'
+                'message' => 'Already Verified',
             ];
         }
 
@@ -27,7 +26,7 @@ class EmailVerificationController extends Controller
     {
         if ($request->user()->hasVerifiedEmail()) {
             return [
-                'message' => 'Email already verified'
+                'message' => 'Email already verified',
             ];
         }
 
@@ -36,7 +35,7 @@ class EmailVerificationController extends Controller
         }
 
         return [
-            'message'=>'Email has been verified'
+            'message' => 'Email has been verified',
         ];
     }
 }

app/Http/Controllers/Mobile/ForgotPasswordController.php

@@ -21,19 +21,15 @@ class ForgotPasswordController extends Controller
 
     use SendsPasswordResetEmails;
 
-
     protected function sendResetLinkResponse(Request $request, $response)
     {
         return response(['message' => $response]);
 
     }
 
-
     protected function sendResetLinkFailedResponse(Request $request, $response)
     {
         return response(['error' => $response], 422);
 
     }
-
-
 }

app/Http/Controllers/Mobile/ResetPasswordController.php

@@ -31,6 +31,4 @@ class ResetPasswordController extends Controller
     {
         return response(['error' => trans($response)], 422);
     }
-
-
 }

app/Http/Controllers/Mobile/UserController.php

@@ -4,14 +4,13 @@ namespace App\Http\Controllers\Mobile;
 
 use App\Http\Controllers\Controller;
 use App\Models\TacCode;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Http\Request;
 use App\Models\User;
-use DB;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Auth;
 use Carbon\Carbon;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Validator;
 
 class UserController extends Controller
 {
@@ -22,19 +21,21 @@ class UserController extends Controller
         if ($user) {
             return response()->json([
                 'success' => true,
-                'message' => [$user]
+                'message' => [$user],
             ], 200);
         } else {
             return response()->json([
                 'success' => false,
-                'message' => 'Unauthorized'
+                'message' => 'Unauthorized',
             ], 401);
         }
     }
-    public function updateProfileUser(Request $request){
+
+    public function updateProfileUser(Request $request)
+    {
 
         $validator = Validator::make($request->all(), [
-            'nokp' => 'required'
+            'nokp' => 'required',
         ]);
 
         if ($validator->fails()) {
@@ -51,7 +52,7 @@ class UserController extends Controller
                 'notelbimbit' => $request->notelbimbit,
                 'notelpejabat' => $request->notelpejabat,
                 'email' => $request->email,
-            'updated_at' => $currentdate
+                'updated_at' => $currentdate,
             ]);
 
         return response()->json($user_update);
@@ -70,22 +71,23 @@ class UserController extends Controller
                 'string' => [
                     'status' => 3,
                     'message' => 'Kata laluan baharu mestilah melebihi 8 karakter.',
-                ]
+                ],
             ],
             'confirm_new_password.required' => ['status' => '4', 'message' => 'Sila isi pengesahan kata laluan baharu.'],
             'confirm_new_password.min' => [
                 'string' => [
                     'status' => 5,
                     'message' => 'Pengesahan kata laluan baharu mestilah melebihi 8 karakter.',
-                ]
+                ],
             ],
         ]);
 
         if ($validator->fails()) {
             $all_errors = [
                 'success' => false,
-                'message' => $validator->errors()
+                'message' => $validator->errors(),
             ];
+
             return response($all_errors, 201);
         }
 
@@ -96,10 +98,10 @@ class UserController extends Controller
                     'current_password' => [
                         0 => [
                             'status' => 9,
-                            'message' => 'Kata laluan asal salah.'
+                            'message' => 'Kata laluan asal salah.',
-                        ]
+                        ],
-                    ]
+                    ],
-                ]
+                ],
             ]);
         }
 
@@ -110,10 +112,10 @@ class UserController extends Controller
                     'current_password' => [
                         0 => [
                             'status' => 8,
-                            'message' => 'Kata laluan baharu tidak boleh sama dengan kata laluan asal.'
+                            'message' => 'Kata laluan baharu tidak boleh sama dengan kata laluan asal.',
-                        ]
+                        ],
-                    ]
+                    ],
-                ]
+                ],
             ]);
         }
 
@@ -124,10 +126,10 @@ class UserController extends Controller
                     'current_password' => [
                         0 => [
                             'status' => 12,
-                            'message' => 'Kata laluan baharu tidak sama dengan pengesahan kata laluan baharu.'
+                            'message' => 'Kata laluan baharu tidak sama dengan pengesahan kata laluan baharu.',
-                        ]
+                        ],
-                    ]
+                    ],
-                ]
+                ],
             ]);
         }
 
@@ -140,7 +142,7 @@ class UserController extends Controller
         return response()->json([
             'success' => true,
             'status' => 55,
-            'message' => 'Kata laluan berjaya diubah'
+            'message' => 'Kata laluan berjaya diubah',
         ]);
     }
 
@@ -152,7 +154,7 @@ class UserController extends Controller
         $date = $current->toDateTimeString();
         $current_date = strtotime($date);
         $future_date = $current_date + (60 * 2);
-        $expired_date_formated = date("Y-m-d H:i:s", $future_date);
+        $expired_date_formated = date('Y-m-d H:i:s', $future_date);
 
         $tac_code = rand(100000, 999999);
 
@@ -164,7 +166,7 @@ class UserController extends Controller
             return response()->json([
                 'success' => false,
                 'message' => 'The phone number already request for tac code. Please wait 2 minute from request time for the session to end.',
-                'response' => $check_status_phone_number
+                'response' => $check_status_phone_number,
             ]);
         }
 
@@ -174,10 +176,10 @@ class UserController extends Controller
             'senderid' => 'INFO',
             'mobileno' => $request->phone_number,
             'message' => '[ArrahnBid]: '.$tac_code.' is your TAC code. The code is valid for 2 minutes.',
-            'languagetype' => 1
+            'languagetype' => 1,
         ]);
 
-        $tac_code_model = new TacCode();
+        $tac_code_model = new TacCode;
         $tac_code_model->tac_code = Hash::make($tac_code);
         $tac_code_model->phone_number = $request->phone_number;
         $tac_code_model->case_code = 1;
@@ -214,7 +216,7 @@ class UserController extends Controller
             return response()->json([
                 'success' => true,
                 'message' => 'Update successful!',
-                'user' => $user
+                'user' => $user,
             ]);
         } else {
             return response()->json([

app/Http/Controllers/Mobile/VerificationController.php

@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Mobile;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Auth\Events\Verified;
 use Illuminate\Foundation\Auth\VerifiesEmails;
-use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Http\Request;
 
 class VerificationController extends Controller
 {
@@ -45,7 +45,6 @@ class VerificationController extends Controller
     /**
      * Resend the email verification notification.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
     public function resend(Request $request)
@@ -64,12 +63,11 @@ class VerificationController extends Controller
         return back()->with('resent', true);
     }
 
-
     /**
      * Mark the authenticated user's email address as verified.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
+     *
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
     public function verify(Request $request)
@@ -94,6 +92,4 @@ class VerificationController extends Controller
         return response(['message' => 'Successfully verified']);
 
     }
-
-   
 }

app/Http/Controllers/PaymentController.php

@@ -2,26 +2,25 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use App\Models\Lelong;
-use App\Models\CawanganLelong;
 use App\Models\Cawangan;
-use App\Models\Resit;
+use App\Models\CawanganLelong;
+use App\Models\FileResit;
+use App\Models\Invoice;
+use App\Models\Lelong;
 use App\Models\LelongBid;
 use App\Models\LelongBidder;
-use App\Models\LelongBidMarhun;
-use App\Models\Payment;
-use App\Models\User;
-use App\Models\File;
-use App\Models\FileResit;
-use Carbon\Carbon;
-use Illuminate\Support\Facades\Auth;
-use App\Models\Invoice;
 use App\Models\PayDenoKaunter;
+use App\Models\Payment;
+use App\Models\Resit;
+use App\Models\User;
+use Carbon\Carbon;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
 class PaymentController extends Controller
 {
-    public function SenaraiLelongBayar(Request $request){
+    public function SenaraiLelongBayar(Request $request)
+    {
 
         $arrayinfo = [];
         $arraysms = [];
@@ -39,17 +38,14 @@ class PaymentController extends Controller
             ->get()
             ->toArray();
 
-
+        foreach ($lelong as $info) {
-        foreach($lelong as $info)
-        {
             $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('lelong_id', $info['lelong_id'])
                 ->where('cawangan.caw_code', $user->kodcaw)
                 ->get()
                 ->toArray();
 
-            if($info['tarikh_lelong'] == $tarikh_semasa)
+            if ($info['tarikh_lelong'] == $tarikh_semasa) {
-            {
                 array_push($arraysms, ['info' => $info, 'detailsinfo' => $detailsinfo]);
             } else {
                 array_push($arraysls, ['info' => $info, 'detailsinfo' => $detailsinfo]);
@@ -64,7 +60,8 @@ class PaymentController extends Controller
 
     }
 
-    public function SenaraiPemenang($lelong_id){
+    public function SenaraiPemenang($lelong_id)
+    {
 
         $user = Auth::user();
 
@@ -116,7 +113,7 @@ class PaymentController extends Controller
             // dd($total_payment);
 
             $listwinner[$index1]['details'] = $userdetails;
-            $listwinner[$index1]['total_surat'] = sizeof($SAGWin);
+            $listwinner[$index1]['total_surat'] = count($SAGWin);
             $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
             $listwinner[$index1]['totalPay'] = $total_payment;
             $listwinner[$index1]['sts_payment'] = $sts_payment[0]['status_payment'];
@@ -145,7 +142,8 @@ class PaymentController extends Controller
 
     }
 
-    public function SAGBidItem($user_id, $lelong_id){
+    public function SAGBidItem($user_id, $lelong_id)
+    {
 
         $user = Auth::user();
 
@@ -179,8 +177,7 @@ class PaymentController extends Controller
             )
             ->get();
 
-        foreach($eachbid as $bid)
+        foreach ($eachbid as $bid) {
-        {
             // dd($bid);
             $paymentstatus = Payment::where('lelong_id', $lelong_id)
                 ->where('user_id', $bid['user_id'])
@@ -189,11 +186,9 @@ class PaymentController extends Controller
                 ->orWhere('status_payment_opt', 3)
                 ->get();
 
-            if($paymentstatus)
+            if ($paymentstatus) {
-            {
                 $total_payment = 0;
-                foreach($paymentstatus as $index1=>$payemnt)
+                foreach ($paymentstatus as $index1 => $payemnt) {
-                {
                     $payment = Payment::where('id', $payemnt->payment_id)
                         ->first();
 
@@ -234,8 +229,7 @@ class PaymentController extends Controller
         $totalbidaan = $eachbid->SUM('hargabida');
 
         $array_resit = [];
-        foreach($getresit as $index1=>$resit)
+        foreach ($getresit as $index1 => $resit) {
-        {
             $getresit[$index1]['resit64'] = 'data:image/'.$resit['file_type'].';base64'.base64_encode($resit['filename']);
         }
         $datacaw = Cawangan::where('caw_code', '=', $user->kodcaw)
@@ -244,7 +238,8 @@ class PaymentController extends Controller
         return view('pembayaran.SAGBidItem', compact('statuspayment', 'datacaw', 'SAGBidItem', 'eachbid', 'lelong_id', 'user_id', 'getresit', 'getinvoice', 'totalbidaan'));
     }
 
-    public function paymentdenokaunter(Request $request){
+    public function paymentdenokaunter(Request $request)
+    {
 
         // dd($request->all());
 
@@ -252,7 +247,7 @@ class PaymentController extends Controller
         $currentdate = $currentdate->toDateTimeString();
 
         $current = Carbon::now();
-        $current = new Carbon();
+        $current = new Carbon;
 
         $day = $current->day;
         $month = $current->month;
@@ -268,7 +263,6 @@ class PaymentController extends Controller
         // $norujukanid = implode(",", $request->norujukan);
         // $norujukan_id = explode(",", $norujukanid);
 
-        
         // dd($eachbid);
 
         $getinvoice = Invoice::where('lelong_id', $request->lelong_id)
@@ -283,7 +277,7 @@ class PaymentController extends Controller
             $nosiri = 1;
         }
 
-            $reference_no = 'LPKB' . $day . $month . $year . sprintf("%08d", $nosiri);
+        $reference_no = 'LPKB'.$day.$month.$year.sprintf('%08d', $nosiri);
 
         $resit = new Resit;
         $resit->user_id = $request->user_id;
@@ -319,10 +313,9 @@ class PaymentController extends Controller
             'rm50' => $request->ambilanring50,
             'rm100' => $request->ambilanring100,
             'disahkan_oleh' => $user->id,
-            'disahkan_pada' => $currentdate
+            'disahkan_pada' => $currentdate,
         ]);
 
-            
         $sagmenang = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
             ->join('users', 'lelongbidder.user_id', '=', 'users.id')
             ->where('lelongbid.status_jual', 1)
@@ -341,9 +334,7 @@ class PaymentController extends Controller
 
         // dd($sagmenang);
 
-   
+        foreach ($sagmenang as $index1 => $bid) {
-        foreach($sagmenang as $index1=>$bid)
-        {
             // dd($bid->lelongbid_id);
             $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
                 ->join('users', 'lelongbidder.user_id', '=', 'users.id')
@@ -378,12 +369,9 @@ class PaymentController extends Controller
                 'resit_id' => $resit->id,
                 'total_payment' => $eachbid->hargabida,
                 'disahkan_oleh' => $user->id,
-                'disahkan_pada' => $currentdate
+                'disahkan_pada' => $currentdate,
             ]);
 
-           
-    
-            
             $updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id)
                 ->where('user_id', $request->user_id)
                 ->first();
@@ -406,11 +394,9 @@ class PaymentController extends Controller
             ->where('lelongbidder.status_bidder', 1)
             ->get();
 
-        if(floatval($request->amaunkiraan) == $total_hargabida)
+        if (floatval($request->amaunkiraan) == $total_hargabida) {
-        {
             $resit->total_payment = $request->amaunkiraan;
-            if($resit->total_payment >= $senaraisagallpayment->sum('hargabida'))
+            if ($resit->total_payment >= $senaraisagallpayment->sum('hargabida')) {
-            {
                 $resit->status = 'PAID'; // $resit->status = 'PAID'; when hargabida >= total_payment di resit
                 $resit->paid_at = $currentdate;
             }
@@ -423,7 +409,8 @@ class PaymentController extends Controller
 
     }
 
-    public function pengesahanPembayaran(Request $request){
+    public function pengesahanPembayaran(Request $request)
+    {
 
         // dd($request->all());
 
@@ -447,8 +434,7 @@ class PaymentController extends Controller
             ->where('payment.user_id', $request->user_id)
             ->first();
 
-        if($paymentexist)
+        if ($paymentexist) {
-        {
             $getpayment = Payment::join('fileresit', 'payment.id', '=', 'fileresit.payment_id')
                 ->where('payment.lelong_id', $request->lelong_id)
                 ->where('payment.user_id', $request->user_id)
@@ -475,12 +461,10 @@ class PaymentController extends Controller
 
             return redirect()->route('pembayaran.kaunterpembayaran', $request->lelong_id)
                 ->with('success', 'Ubah Resit Berjaya, Tunggu Pengesahan Akaun');
-        }
+        } else {
-        else
-        {
             // $bid_id = $request->eachbid;
-            $bidid = implode(",", $request->eachbid);
+            $bidid = implode(',', $request->eachbid);
-            $bid_id = explode(",", $bidid);
+            $bid_id = explode(',', $bidid);
             $currentdate = Carbon::now();
             $currentdate = $currentdate->toDateTimeString();
 
@@ -515,8 +499,7 @@ class PaymentController extends Controller
             $addfile->filename = $data;
             $addfile->save();
 
-            foreach($bid_id as $bid)
+            foreach ($bid_id as $bid) {
-            {
                 $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
                     ->join('users', 'lelongbidder.user_id', '=', 'users.id')
                     ->where('lelongbidder.lelongbid_id', $bid)
@@ -542,7 +525,6 @@ class PaymentController extends Controller
 
             }
 
-    
             return redirect()->route('pembayaran.kaunterpembayaran', $request->lelong_id)
                 ->with('success', 'Menunggu Pengesahan Akaun');
 

app/Http/Controllers/PembidaController.php

@@ -2,38 +2,35 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use Spatie\Permission\Models\Role;
-use Spatie\Permission\Models\Permission;
-use Illuminate\Support\Facades\Auth;
-use PDF;
-use Carbon\Carbon;
-
-use App\Models\User;
-use App\Models\File;
-use App\Models\Lelong;
-use App\Models\CawanganLelong;
-use App\Models\LelongBidder;
-use App\Models\LelongBid;
-use App\Models\Payment;
 use App\Models\Cawangan;
-use App\Models\TakLaku;
+use App\Models\CawanganLelong;
-use App\Models\LogUser;
+use App\Models\File;
 use App\Models\FileResit;
 use App\Models\Invoice;
+use App\Models\Lelong;
+use App\Models\LelongBid;
+use App\Models\LelongBidder;
+use App\Models\LogUser;
+use App\Models\Payment;
 use App\Models\ScanJual;
-use App\Services\ResitPhotoService;
+use App\Models\TakLaku;
-use Symfony\Component\Console\Descriptor\Descriptor;
+use App\Models\User;
-use Illuminate\Support\Facades\DB;
 use App\Services\BillplzService;
-use App\Http\Controllers\ApiController;
+use App\Services\ResitPhotoService;
-
+use Carbon\Carbon;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use Spatie\Permission\Models\Role;
 
 class PembidaController extends Controller
 {
     private $resitPhotoService;
+
     protected $billplzService;
+
     protected $ResitSemakanService;
+
     /**
      * Create a new controller instance.
      *
@@ -74,8 +71,7 @@ class PembidaController extends Controller
         $files = File::where('user_id', '=', $userid)->get()->toArray();
         // dd($files);
         $array_ic = [];
-        foreach($files as $index=>$file)
+        foreach ($files as $index => $file) {
-        {
             $files[$index]['ic64'] = 'data:image/'.$file['file_type'].';base64,'.base64_encode($file['filename']);
         }
 
@@ -104,8 +100,7 @@ class PembidaController extends Controller
         $user->disahkan_oleh = Auth::user()->id;
         $user->status = 'active';
 
-        if($user->save())
+        if ($user->save()) {
-        {
             $user->assignRole('pembida');
         }
 
@@ -151,8 +146,7 @@ class PembidaController extends Controller
         $files = File::where('user_id', '=', $userid)->get()->toArray();
 
         $array_ic = [];
-        foreach($files as $index=>$file)
+        foreach ($files as $index => $file) {
-        {
             $files[$index]['ic64'] = 'data:image/'.$file['file_type'].';base64,'.base64_encode($file['filename']);
         }
 
@@ -165,16 +159,11 @@ class PembidaController extends Controller
         $currentdate = Carbon::now();
         $currentdate = $currentdate->toDateTimeString();
 
-        if($request->status == true)
+        if ($request->status == true) {
-        {
             $status = 'active';
-        }
+        } elseif ($request->statusban == true) {
-        else if($request->statusban == true)
-        {
             $status = 'banned';
-        }
+        } else {
-        else
-        {
             $status = 'inactive';
         }
 
@@ -198,7 +187,6 @@ class PembidaController extends Controller
     {
         $kodcaw = $request->kodcaw;
 
-
         $arrayinfo = [];
 
         $lelong = Lelong::join('cawangan_lelong', 'lelong.id', '=', 'cawangan_lelong.lelong_id')
@@ -209,8 +197,7 @@ class PembidaController extends Controller
             ->get()
             ->toArray();
 
-        foreach($lelong as $details)
+        foreach ($lelong as $details) {
-        {
 
             $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id', 'caw_name', 'caw_code', 'cawangan_lelong.export_data_sts')
@@ -228,8 +215,6 @@ class PembidaController extends Controller
         return view('pembida.senlelpembayaranbidaan', compact('lelong', 'arrayinfo'));
     }
 
-   
-
     public function senlelbelumbayarbidaan(Request $request)
     {
         $kodcaw = $request->kodcaw;
@@ -254,15 +239,14 @@ class PembidaController extends Controller
             ->orderBy('lelong.id', 'DESC')
             ->get();
         // dd($lelong);
-        foreach($lelong as $index=>$info)
+        foreach ($lelong as $index => $info) {
-        {
+            if ($info['tarikh_lelong'] == $tarikh_semasa) {
-        if($info['tarikh_lelong'] == $tarikh_semasa)
-            {
                 array_push($arraysms, ['info' => $info]);
             } else {
                 array_push($arraysls, ['info' => $info]);
             }
         }
+
         return view('pembida.senlelbelumbayarbidaan', compact('arraysms', 'arraysls', 'lelong'));
     }
 
@@ -282,8 +266,7 @@ class PembidaController extends Controller
             ->get()->toArray();
         // dd($listwinner);
 
-        foreach($listwinner as $index1=>$winner)
+        foreach ($listwinner as $index1 => $winner) {
-        {
             $userdetails = User::where('id', $winner['user_id'])->first();
 
             $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
@@ -294,11 +277,9 @@ class PembidaController extends Controller
                 ->get();
             // dd($SAGWin);
 
-            foreach($SAGWin as $index2=>$sag)
+            foreach ($SAGWin as $index2 => $sag) {
-            {
                 // dd($sag->payment_id);
-                if($sag)
+                if ($sag) {
-                {
                     $detailspayment = Payment::where('id', $sag->payment_id)->first();
                     // dd($detailspayment);
                 }
@@ -315,14 +296,11 @@ class PembidaController extends Controller
             // dd($payment_id);
 
             $total_payment = 0;
-            foreach($payment as $id)
+            foreach ($payment as $id) {
-            {
                 $payment = Payment::where('id', $id->payment_id)
                     ->first();
                 // dd($payment);
 
-
-
                 if ($payment) {
                     $payment_id = $id->payment_id;
                     $total_payment = $total_payment + $payment->total_payment;
@@ -330,7 +308,7 @@ class PembidaController extends Controller
             }
 
             $listwinner[$index1]['details'] = $userdetails;
-            $listwinner[$index1]['total_surat'] = sizeof($SAGWin);
+            $listwinner[$index1]['total_surat'] = count($SAGWin);
             $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
             $listwinner[$index1]['totalPay'] = $total_payment;
             $listwinner[$index1]['payment_id'] = $payment_id;
@@ -357,12 +335,11 @@ class PembidaController extends Controller
         $kodcaw = $request->kodcaw;
         $lelong_id = $request->lelong_id;
         $payment_id = $request->payment_id;
+
         // dd($kodcaw);
         return view('pembida.pembayaranbidaan', compact('bilcdm', 'bilfpx', 'biltunai', 'kaedah_cdm', 'kaedah_fpx', 'kaedah_tunai', 'listwinner', 'lelong_id', 'getkodcaw', 'kodcaw'));
     }
 
-    
-
     public function detailsbidaan($lelong_id, $user_id, $kodcaw)
     {
 
@@ -392,8 +369,7 @@ class PembidaController extends Controller
             ->get();
         // dd($infos);
 
-        foreach ($infos as $index1 => $info) 
+        foreach ($infos as $index1 => $info) {
-        {
             $butiranbidaan = Payment::join('resit', 'payment.resit_id', '=', 'resit.id')
                 ->where('payment.id', $info['payment_id'])
                 ->where('payment.lelong_id', $info['lelong_id'])
@@ -411,7 +387,6 @@ class PembidaController extends Controller
             // dd($infos[$index1]['butiran_bidaan']);
         }
 
-        
         return view('pembida.detailsbidaan', compact('infos', 'userdetail', 'kodcaw'));
     }
 
@@ -433,8 +408,8 @@ class PembidaController extends Controller
 
         $total_payment = $lelong_bid_all->sum('hargabida');
         $fileresit_all = FileResit::where('lelong_id', $lelong_id)->where('user_id', $user_id)->where('kodcaw', $kodcaw)->get();
-        if ($disahkan_oleh->remark == "BERJAYA BAYARAN ONLINE") {
+        if ($disahkan_oleh->remark == 'BERJAYA BAYARAN ONLINE') {
-            $disahkan_oleh->remark = "FPX";
+            $disahkan_oleh->remark = 'FPX';
         }
 
         return view('pembida.detailspembayaran', compact('lelong', 'cawangan', 'user', 'fileresit_all', 'total_payment', 'disahkan_oleh'));
@@ -443,6 +418,7 @@ class PembidaController extends Controller
     public function showPhotoResit(Request $request)
     {
         $resit = FileResit::where('id', '=', $request->fileresit_id)->first();
+
         return $this->resitPhotoService->show($request->user_id, $resit);
     }
 
@@ -476,8 +452,7 @@ class PembidaController extends Controller
         $t_lelong = Carbon::parse($request->t_lelong);
         $data = $request->checkboxdata;
         // dd($data);
-        foreach($data as $index=>$norujukan)
+        foreach ($data as $index => $norujukan) {
-        {
             $user = Auth::user();
             $currentdate = Carbon::now();
             $currentdate = $currentdate->toDateTimeString();
@@ -530,11 +505,9 @@ class PembidaController extends Controller
             $datalelbid = LelongBidder::where('lelongbid_id', $bida->id)
                 ->where('user_id', $infos->user_id)->get();
             $suratcaw = $datalelbid->all();
-                foreach(array_chunk($suratcaw,100) as $data_chunk)
+            foreach (array_chunk($suratcaw, 100) as $data_chunk) {
-                {
                 // dd($datalelbid);
-                    foreach($data_chunk as $data)
+                foreach ($data_chunk as $data) {
-                   {
                     $savedata = $data->replicate();
                     $savedata->setTable('lelongbidder_temp');
                     $savedata->save();
@@ -553,11 +526,9 @@ class PembidaController extends Controller
 
             $datalelbidxlaku = LelongBid::where('norujukan', $bida->norujukan)->get();
             $suratcawxlaku = $datalelbidxlaku->all();
-                    foreach(array_chunk($suratcawxlaku,100) as $data_chunkxlaku)
+            foreach (array_chunk($suratcawxlaku, 100) as $data_chunkxlaku) {
-                    {
                 // dd($datalelbid);
-                        foreach($data_chunkxlaku as $dataxlaku)
+                foreach ($data_chunkxlaku as $dataxlaku) {
-                       {
                     $savedataxlaku = $dataxlaku->replicate();
                     $savedataxlaku->setTable('lelongbid_xlaku');
                     $savedataxlaku->save();
@@ -584,6 +555,7 @@ class PembidaController extends Controller
             $loguser->nota = ' Tak Laku Lelong';
             $loguser->save();
         }
+
         return redirect()->route('pembida.senlelbelumbayarbidaan');
     }
 
@@ -591,7 +563,6 @@ class PembidaController extends Controller
     {
         $kodcaw = $request->kodcaw;
 
-
         $arrayinfo = [];
 
         $lelong = Lelong::join('cawangan_lelong', 'lelong.id', '=', 'cawangan_lelong.lelong_id')
@@ -602,8 +573,7 @@ class PembidaController extends Controller
             ->get()
             ->toArray();
 
-        foreach($lelong as $details)
+        foreach ($lelong as $details) {
-        {
 
             $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id', 'caw_name', 'caw_code', 'cawangan_lelong.export_data_sts')
@@ -657,7 +627,8 @@ class PembidaController extends Controller
     //     return view('pembida.senaraipemenangbycaw',compact('listwinner','lelong_id','caw_code'));
     // }
 
-    public function senaraisagpemenangbycaw($user_id, $lelong_id, $kodcaw){
+    public function senaraisagpemenangbycaw($user_id, $lelong_id, $kodcaw)
+    {
 
         $userdetails = User::where('id', $user_id)->first();
 
@@ -668,10 +639,11 @@ class PembidaController extends Controller
             ->where('lelongbidder.status_bidder', 1)
             ->get();
 
-
         return view('pembida.senaraisagpemenangbycaw', compact('senaraisag', 'user_id', 'lelong_id', 'userdetails'));
     }
-    public function senaraipemenangbycaw(Request $request,$lelong_id){
+
+    public function senaraipemenangbycaw(Request $request, $lelong_id)
+    {
 
         // $user = Auth::user();
         $caw_code = $request->kodcaw;
@@ -724,7 +696,7 @@ class PembidaController extends Controller
             // dd($total_payment);
 
             $listwinner[$index1]['details'] = $userdetails;
-            $listwinner[$index1]['total_surat'] = sizeof($SAGWin);
+            $listwinner[$index1]['total_surat'] = count($SAGWin);
             $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
             $listwinner[$index1]['totalPay'] = $total_payment;
             $listwinner[$index1]['sts_payment'] = $sts_payment[0]['status_payment'];
@@ -736,9 +708,10 @@ class PembidaController extends Controller
         // return view('pembayaran.kaunterpembayaran',compact('listwinner','lelong_id'));
         return view('pembida.senaraipemenangbycaw', compact('datacaw', 'listwinner', 'lelong_id', 'caw_code'));
 
-
     }
-    public function SAGBidItembycaw($user_id, $lelong_id,$kodcaw){
+
+    public function SAGBidItembycaw($user_id, $lelong_id, $kodcaw)
+    {
 
         // $user = Auth::user();
 
@@ -773,15 +746,13 @@ class PembidaController extends Controller
             ->get();
         // dd($eachbid);
 
-        foreach($eachbid as $bid)
+        foreach ($eachbid as $bid) {
-        {
             $totalbidaan = $bid->sum('hargabida');
             //    dd($totalbidaan);
         }
         $totalbidaan = $eachbid->SUM('hargabida');
         // dd($totalbidaan);
 
-              
         $statuspayment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
             ->join('users', 'lelongbidder.user_id', '=', 'users.id')
             ->where('lelongbidder.status_bidder', 1)
@@ -805,15 +776,13 @@ class PembidaController extends Controller
             ->get()->toArray();
         // dd($getresit);
 
-        
         $getinvoice = Invoice::where('lelong_id', $lelong_id)
             ->where('user_id', '=', $user_id)
             ->first();
         // dd($getinvoice);
 
         $array_resit = [];
-        foreach($getresit as $index1=>$resit)
+        foreach ($getresit as $index1 => $resit) {
-        {
             $getresit[$index1]['resit64'] = 'data:image/'.$resit['file_type'].';base64'.base64_encode($resit['filename']);
         }
 
@@ -835,8 +804,6 @@ class PembidaController extends Controller
         $lelong_id = $request->lelong_id;
         $kodcaw = $request->kodcaw;
 
-       
-           
         // $opencash = Invoice::where('lelong_id',$lelong_id)
         // ->where('user_id','=',$idpembida)
         // ->first();
@@ -848,8 +815,7 @@ class PembidaController extends Controller
             ->where('kodcaw', '=', $kodcaw)
             ->get();
         // dd($opencashlelongbid);
-            foreach($lelongbid as $lelbid)
+        foreach ($lelongbid as $lelbid) {
-            {
             $opencashlelongbid = LelongBid::where('lelong_id', $lelong_id)
                 ->where('nopembeli', '=', $idpembida)
                 ->where('kodcaw', '=', $kodcaw)
@@ -871,13 +837,12 @@ class PembidaController extends Controller
 
         // audit trail
 
-        
-            
         return redirect()->route('pembida.kebenaranbayarantunai')->with('success', 'Kebenaran Berjaya');
 
     }
 
-    public function SenaraiPemenang($lelong_id,$kodcaw){
+    public function SenaraiPemenang($lelong_id, $kodcaw)
+    {
 
         // $user = Auth::user();
 
@@ -929,7 +894,7 @@ class PembidaController extends Controller
             // dd($total_payment);
 
             $listwinner[$index1]['details'] = $userdetails;
-            $listwinner[$index1]['total_surat'] = sizeof($SAGWin);
+            $listwinner[$index1]['total_surat'] = count($SAGWin);
             $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
             $listwinner[$index1]['totalPay'] = $total_payment;
             $listwinner[$index1]['sts_payment'] = $sts_payment[0]['status_payment'];
@@ -959,8 +924,7 @@ class PembidaController extends Controller
             ->toArray();
         // dd($lelong);
 
-        foreach($lelong as $details)
+        foreach ($lelong as $details) {
-        {
             $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id', 'caw_name', 'cawangan.caw_code', 'cawangan_lelong.export_data_sts')
                 ->where('lelong_id', $details['lelong_id'])
@@ -969,8 +933,7 @@ class PembidaController extends Controller
                 ->get();
 
             // array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
-            if($details['tarikh_lelong'] == $tarikh_semasa)
+            if ($details['tarikh_lelong'] == $tarikh_semasa) {
-            {
                 array_push($arraysms, ['detail' => $details, 'detailsinfo' => $detailsinfo]);
             } else {
                 array_push($arraysls, ['detail' => $details, 'detailsinfo' => $detailsinfo]);
@@ -996,23 +959,20 @@ class PembidaController extends Controller
                         ->where('lelongbidder.status_bidder', 1)
                         ->where('lelongbid.lelong_id', $listing['lelong_id'])
                         ->get();
-                    foreach($SAGWin as $index2=>$sag)
+                    foreach ($SAGWin as $index2 => $sag) {
-                    {
                         // dd($detailspayment);
                         $detailspayment = null;
-                        if($sag['payment_id'] != null)
+                        if ($sag['payment_id'] != null) {
-                        {
                             $detailspayment = Payment::where('id', $sag['payment_id'])->first();
                             $total_payment = $total_payment + $detailspayment->total_payment;
                             // dd($total_payment);
-                        }else
+                        } else {
-                        {
                             $total_payment = '0.00';
                         }
 
                     }
                     $listwinner[$index]['details'] = $userdetails;
-                    $listwinner[$index]['total_surat'] = sizeof($SAGWin);
+                    $listwinner[$index]['total_surat'] = count($SAGWin);
                     $listwinner[$index]['totalBid'] = $SAGWin->sum('hargabida');
                     $listwinner[$index]['totalPay'] = $total_payment;
                     $listwinner[$index]['jenisbayaran'] = $detailspayment;
@@ -1022,6 +982,7 @@ class PembidaController extends Controller
                 $detailsinfo[$index1]['listwinner'] = $listwinner;
             }
         }
+
         // $sumtotalpayment += $total_payment;
         // dd($sumtotalpayment);
         // dd($arrayinfo);
@@ -1066,11 +1027,11 @@ class PembidaController extends Controller
                         $user_to_be_added['name_bidder'] = $user[0]->nama_bidder;
                         $user_to_be_added['jumlah_bidaan'] = $user->sum('hargabida');
                         $user_to_be_added['status_bayaran'] = $user[0]->status_payment;
-                        $user_to_be_added['serah'] = $user[0]->scanjual ? $user[0]->scanjual->serahkpdpembida : "";
+                        $user_to_be_added['serah'] = $user[0]->scanjual ? $user[0]->scanjual->serahkpdpembida : '';
                         if ($user[0]->payment != null) {
                             $user_to_be_added['jenis_bayaran'] = $user[0]->payment->status_payment_opt;
                         } else {
-                            $user_to_be_added['jenis_bayaran'] = "99";
+                            $user_to_be_added['jenis_bayaran'] = '99';
                         }
                         array_push($user_array, $user_to_be_added);
                     }
@@ -1097,6 +1058,7 @@ class PembidaController extends Controller
                 array_push($lelong_array_selesai, $lelong);
             }
         }
+
         return view('pembida.statuspembayaran2', compact('lelong_array_semasa', 'lelong_array_selesai'));
     }
 
@@ -1104,8 +1066,6 @@ class PembidaController extends Controller
     {
         $kodcaw = $request->kodcaw;
 
-        
-       
         $arrayinfo = [];
 
         $lelong = Lelong::join('cawangan_lelong', 'lelong.id', '=', 'cawangan_lelong.lelong_id')
@@ -1117,8 +1077,7 @@ class PembidaController extends Controller
             ->toArray();
         // dd($lelong);
 
-        foreach($lelong as $details)
+        foreach ($lelong as $details) {
-        {
             $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
                 ->where('lelongbidder.status_bidder', 1)
                 ->where('lelongbid.lelong_id', $details['lelong_id'])
@@ -1131,7 +1090,6 @@ class PembidaController extends Controller
 
             foreach ($listwinner as $index1 => $cal) {
 
-                   
                 $userdetails = User::where('id', $cal['user_id'])->first();
                 $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
                     ->where('lelongbid.nopembeli', $cal['user_id'])
@@ -1141,18 +1099,15 @@ class PembidaController extends Controller
                     ->get();
                 // dd($SAGWin);
                 $total_payment = 0;
-                    foreach($SAGWin as $index2=>$sag)
+                foreach ($SAGWin as $index2 => $sag) {
-                    {
                     // dd($detailspayment);
                     $detailspayment = null;
-                        if($sag['payment_id'] != null)
+                    if ($sag['payment_id'] != null) {
-                        {
                         $detailspayment = Payment::where('id', $sag['payment_id'])
                             ->get();
                         $total_payment += $detailspayment->sum('total_payment');
                         // dd($total_payment);
-                        }else
+                    } else {
-                        {
                         $total_payment = '0.00';
                     }
 
@@ -1169,12 +1124,13 @@ class PembidaController extends Controller
                     $listwinner[$index]['cawangan'] = $cawanganbidder;
                 }
                 $listwinner[$index1]['details'] = $userdetails;
-                    $listwinner[$index1]['total_surat'] = sizeof($SAGWin);
+                $listwinner[$index1]['total_surat'] = count($SAGWin);
                 $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
                 $listwinner[$index1]['totalPay'] = $total_payment;
                 $listwinner[$index1]['jenisbayaran'] = $detailspayment;
             }
         }
+
         return view('pembida.statuspembayaranbypembida', compact('listwinner', 'lelong', 'arrayinfo', 'cawanganbidder'));
     }
 
@@ -1190,7 +1146,6 @@ class PembidaController extends Controller
         $arraysms = [];
         $arraysls = [];
 
-
         $lelong = Lelong::join('cawangan_lelong', 'lelong.id', '=', 'cawangan_lelong.lelong_id')
             ->select('lelong_id', 'tarikh_lelong', 'lelong.fasa', 'harga_emas_asas', 'jbg', 'cajlelong', 'sts_lelong')
             ->distinct()
@@ -1200,9 +1155,7 @@ class PembidaController extends Controller
             ->toArray();
         // dd($lelong);
 
-        foreach($lelong as $details)
+        foreach ($lelong as $details) {
-        {
-            
 
             $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id', 'caw_name', 'cawangan.caw_code', 'cawangan_lelong.export_data_sts')
@@ -1211,18 +1164,14 @@ class PembidaController extends Controller
                 ->orderBy('lelong_id')
                 ->get();
 
-
+            if ($details['tarikh_lelong'] == $tarikh_semasa) {
-            if($details['tarikh_lelong'] == $tarikh_semasa)
-            {
                 array_push($arraysms, ['detail' => $details, 'detailsinfo' => $detailsinfo]);
             } else {
                 array_push($arraysls, ['detail' => $details, 'detailsinfo' => $detailsinfo]);
             }
 
-
             // array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
 
-           
             foreach ($detailsinfo as $index1 => $cal) {
                 $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
                 // ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
@@ -1243,13 +1192,11 @@ class PembidaController extends Controller
                         ->where('lelongbidder.status_bidder', 1)
                         ->where('lelongbid.lelong_id', $listing['lelong_id'])
                         ->get();
-                    foreach($SAGWin as $index2=>$sag)
+                    foreach ($SAGWin as $index2 => $sag) {
-                    {
                         // dd($detailspayment);
                         $detailspayment = null;
                         $scanserah = null;
-                        if($sag['payment_id'] != null)
+                        if ($sag['payment_id'] != null) {
-                        {
                             $detailspayment = Payment::where('id', $sag['payment_id'])->first();
                             $total_payment = $total_payment + $detailspayment->total_payment;
                             // dd($total_payment);
@@ -1258,8 +1205,7 @@ class PembidaController extends Controller
                                 ->first();
                             // dd($scanserah);
 
-                        }else
+                        } else {
-                        {
                             $total_payment = '0.00';
                             // $scanserah = 'Belum Bayar';
                             $scanserah = null;
@@ -1267,7 +1213,7 @@ class PembidaController extends Controller
 
                     }
                     $listwinner[$index]['details'] = $userdetails;
-                    $listwinner[$index]['total_surat'] = sizeof($SAGWin);
+                    $listwinner[$index]['total_surat'] = count($SAGWin);
                     $listwinner[$index]['totalBid'] = $SAGWin->sum('hargabida');
                     $listwinner[$index]['totalPay'] = $total_payment;
                     $listwinner[$index]['jenisbayaran'] = $detailspayment;
@@ -1278,7 +1224,6 @@ class PembidaController extends Controller
                 $detailsinfo[$index1]['listwinner'] = $listwinner;
             }
 
-            
         }
 
         // $sumtotalpayment += $total_payment;
@@ -1306,8 +1251,7 @@ class PembidaController extends Controller
             ->toArray();
         // dd($lelong);
 
-        foreach($lelong as $details)
+        foreach ($lelong as $details) {
-        {
             $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
                 ->where('lelongbidder.status_bidder', 1)
                 ->where('lelongbid.lelong_id', $details['lelong_id'])
@@ -1316,8 +1260,7 @@ class PembidaController extends Controller
                 ->get();
             // dd($listwinner);
 
-            if($details['tarikh_lelong'] == $tarikh_semasa)
+            if ($details['tarikh_lelong'] == $tarikh_semasa) {
-            {
                 array_push($arraysms, ['detail' => $details, 'listwinner' => $listwinner]);
             } else {
                 array_push($arraysls, ['detail' => $details, 'listwinner' => $listwinner]);
@@ -1327,7 +1270,6 @@ class PembidaController extends Controller
 
             foreach ($listwinner as $index1 => $cal) {
 
-                   
                 $userdetails = User::where('id', $cal['user_id'])->first();
                 $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
                     ->where('lelongbid.nopembeli', $cal['user_id'])
@@ -1337,12 +1279,10 @@ class PembidaController extends Controller
                     ->get();
                 // dd($SAGWin);
                 $total_payment = 0;
-                    foreach($SAGWin as $index2=>$sag)
+                foreach ($SAGWin as $index2 => $sag) {
-                    {
                     // dd($detailspayment);
                     $detailspayment = null;
-                        if($sag['payment_id'] != null)
+                    if ($sag['payment_id'] != null) {
-                        {
                         $detailspayment = Payment::where('id', $sag['payment_id'])
                             ->get();
                         $total_payment += $detailspayment->sum('total_payment');
@@ -1350,8 +1290,7 @@ class PembidaController extends Controller
                         $scanserah = ScanJual::where('lelongbid_id', $sag['lelongbid_id'])
                             ->select('serahkpdpembida')
                             ->first();
-                        }else
+                    } else {
-                        {
                         $total_payment = '0.00';
                     }
 
@@ -1368,13 +1307,14 @@ class PembidaController extends Controller
                     $listwinner[$index]['cawangan'] = $cawanganbidder;
                 }
                 $listwinner[$index1]['details'] = $userdetails;
-                    $listwinner[$index1]['total_surat'] = sizeof($SAGWin);
+                $listwinner[$index1]['total_surat'] = count($SAGWin);
                 $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
                 $listwinner[$index1]['totalPay'] = $total_payment;
                 $listwinner[$index1]['jenisbayaran'] = $detailspayment;
                 $listwinner[$index1]['serah'] = $scanserah;
             }
         }
+
         // return view('pembida.statusserahanbypembida',compact('listwinner','lelong','arrayinfo','cawanganbidder'));
         return view('pembida.statusserahanbypembida', compact('arraysms', 'arraysls', 'listwinner', 'lelong', 'cawanganbidder'));
     }
@@ -1442,7 +1382,6 @@ class PembidaController extends Controller
             })
             ->values(); // Reset index
 
-
         $billplzWithCdmResits = DB::table('resit as r')
             ->join('payment as p', 'p.resit_id', '=', 'r.id')
             ->join(DB::raw('(
@@ -1485,10 +1424,6 @@ class PembidaController extends Controller
                 ];
             })->values();
 
-
-        
-
-
         // Semak status Billplz untuk setiap resit
         $paidResits = collect();
         $unpaidResits = collect();
@@ -1531,7 +1466,7 @@ class PembidaController extends Controller
                 'resit_id' => $request->resit_id,
                 'paid' => 'true',
                 'paid_at' => $request->paid_at ?? now()->toDateTimeString(),
-            ]
+            ],
         ];
 
         $apiController = app(ApiController::class);
@@ -1539,6 +1474,4 @@ class PembidaController extends Controller
 
         return redirect()->back()->with('success', 'Resit telah diproses.');
     }
-    
 }
-       

app/Http/Controllers/PenggunaController.php

@@ -2,16 +2,15 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
+use App\Models\Cawangan;
-use Spatie\Permission\Models\Role;
-use Spatie\Permission\Models\Permission;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Support\Facades\Auth;
 use App\Models\User;
 use Carbon\Carbon;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Validator;
 use PDF;
-
+use Spatie\Permission\Models\Permission;
-use App\Models\Cawangan;
+use Spatie\Permission\Models\Role;
 
 class PenggunaController extends Controller
 {
@@ -33,14 +32,16 @@ class PenggunaController extends Controller
     public function index()
     {
         // $alluser = User::all();
-        $alluser = User::with('roles','cawangan')->whereHas("roles", function($q) {
+        $alluser = User::with('roles', 'cawangan')->whereHas('roles', function ($q) {
-            $q->where("id",'!=', 8);})
+            $q->where('id', '!=', 8);
+        })
             ->orderBy('name', 'ASC')
             ->get();
         // dd($alluser);
         $allroles = Role::all();
         $allRolesPluck = $allroles->pluck('name');
         $caw = Cawangan::all();
+
         // $user = User::with('roles')->first();
         // // dd($user);
         // $userroles = $user->getRoleNames()->toArray();
@@ -49,7 +50,6 @@ class PenggunaController extends Controller
         return view('pengurusanpengguna.index', compact('alluser', 'allroles', 'caw', 'allRolesPluck'));
     }
 
-
     public function show(Request $request, $userid)
     {
         // dd($userid);
@@ -70,7 +70,7 @@ class PenggunaController extends Controller
         // dd($request->all());
         $validator = Validator::make($request->all(), [
             'email' => 'required|string|unique:users|email',
-            'username' => 'required|string|unique:users'
+            'username' => 'required|string|unique:users',
         ]);
 
         // if ($validator->fails()) {
@@ -88,8 +88,7 @@ class PenggunaController extends Controller
             ->orWhere('email', $request->email)
             ->first();
 
-            if($check)
+        if ($check) {
-            {
             return redirect()->route('pengguna.index')->with('failed', 'Maaf, Nama Pengguna / Emel Berikut Telah Wujud !');
         } else {
 
@@ -98,8 +97,7 @@ class PenggunaController extends Controller
             $counttaraf = 0;
             foreach ($allroles as $index => $taraf) {
                 $req = 'taraf'.$taraf;
-                    if($request->$req)
+                if ($request->$req) {
-                    {
                     $counttaraf++;
                     array_push($arraytaraf, $taraf);
                 }
@@ -120,19 +118,17 @@ class PenggunaController extends Controller
             $user->password = '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi'; // password
             if ($arraytaraf[0] == 'ajk') {
                 $user->user_type = 3;
-                }
+            } else {
-                else{
                 $user->user_type = 1;
             }
 
             $user->save();
 
             $user->syncRoles($arraytaraf);
+
             return redirect()->route('pengguna.index')
                 ->with('success', 'Pengguna Berjaya Disimpan');
 
-                
-                
         }
 
     }
@@ -150,27 +146,22 @@ class PenggunaController extends Controller
         foreach ($allroles as $index => $taraf) {
             $req = 'taraf'.$taraf;
             // dd($req);
-            if($request->$req)
+            if ($request->$req) {
-            {
                 array_push($arraytaraf, $taraf);
             }
         }
         // dd($arraytaraf);
         $user->syncRoles($arraytaraf);
 
-        if($request->status == true)
+        if ($request->status == true) {
-        {
             $status = 'active';
-        }
+        } elseif ($request->statusban == true) {
-        else if($request->statusban == true)
-        {
             $status = 'banned';
         }
         // else if(!($request->has('status'))){
         //     $status = 'active';
         // }
-        else
+        else {
-        {
             $status = 'inactive';
         }
 
@@ -195,11 +186,11 @@ class PenggunaController extends Controller
     {
         $user = User::where('id', '=', $userid)->first();
         $allrolesuser = $user->getRoleNames();
-        foreach($allrolesuser as $index=>$role)
+        foreach ($allrolesuser as $index => $role) {
-        {
             $user->removeRole($role);
         }
         $user->delete();
+
         return redirect()->route('pengguna.index')
             ->with('success', 'Padam Pengguna Berjaya');
     }
@@ -213,6 +204,7 @@ class PenggunaController extends Controller
 
         return view('pengurusanpengguna.taraf', compact('roles', 'permission'));
     }
+
     public function showtaraf($tarafid)
     {
         // dd($tarafname->permissions);
@@ -220,6 +212,7 @@ class PenggunaController extends Controller
         $selectedroles = $roles->name;
         $allpermission = Permission::all()->pluck('name');
         $userpermission = $roles->permissions->pluck('name')->toArray();
+
         // dd($roles->permissions->pluck('name'));
         return view('pengurusanpengguna.showtaraf', compact('selectedroles', 'allpermission', 'userpermission'));
     }
@@ -233,8 +226,7 @@ class PenggunaController extends Controller
         foreach ($allpermission as $index => $roles) {
             $req = 'role'.$roles;
             // dd($req);
-            if($request->$req)
+            if ($request->$req) {
-            {
                 array_push($arraypermission, $roles);
             }
         }
@@ -259,6 +251,7 @@ class PenggunaController extends Controller
     public function roles() // roles = permissions in db
     {
         $allpermission = Permission::all();
+
         // $user =  Auth::user();
         // $user->assignRole('admin');
         return view('pengurusanpengguna.roles', compact('allpermission'));
@@ -269,8 +262,9 @@ class PenggunaController extends Controller
         // dd($request->all());
         Permission::create([
             'name' => $request->name,
-            'description' => $request->keterangan
+            'description' => $request->keterangan,
         ]);
+
         return redirect()->route('pengguna.roles')
             ->with('success', 'Role berjaya disimpan');
     }
@@ -278,6 +272,7 @@ class PenggunaController extends Controller
     public function showrole($roleid) // roles = permissions in db
     {
         $permission = Permission::where('id', '=', $roleid)->first();
+
         // $user =  Auth::user();
         // $user->assignRole('admin');
         return view('pengurusanpengguna.showrole', compact('permission'));
@@ -286,13 +281,16 @@ class PenggunaController extends Controller
     public function storerole(Request $request)
     {
         $role = Permission::where('id', '=', $request->idrole)->first();
+
         return redirect()->route('pengguna.roles')
             ->with('success', 'Kemaskini Berjaya');
     }
+
     public function updateroles(Request $request)
     {
         $user = User::where('id', '=', $request->id);
         $user->syncPermissions($request->arrayroles);
+
         // $user =  Auth::user();
         // $user->assignRole('admin');
         return redirect()->route('pengguna.roles')
@@ -303,63 +301,52 @@ class PenggunaController extends Controller
     {
         $role = Permission::where('id', '=', $roleid)->first();
         $role->delete();
+
         return redirect()->route('pengguna.roles')
             ->with('success', 'Padam Roles Berjaya');
     }
 
     public function export(Request $request)
     {
-        if($request->type =='Role' || $request->type =='Permission')
+        if ($request->type == 'Role' || $request->type == 'Permission') {
-        {
             $model_name = '\\Spatie\\Permission\\Models\\'.$request->type;
-        }
+        } else {
-        else
-        {
             $model_name = '\\App\\Models\\'.$request->type;
         }
 
         // dd($request->checkboxdata);
-        if($request->checkboxdata)
+        if ($request->checkboxdata) {
-        {
+            if ($request->type == 'User') {
-            if($request->type == 'User')
-            {
                 $data = $model_name::whereIn('id', $request->checkboxdata)->with('roles')->get();
 
-            }
+            } else {
-            else{
                 $data = $model_name::whereIn('id', $request->checkboxdata)->get();
             }
-        }
+        } else {
-        else
+            if ($request->type == 'User') {
-        {
-            if($request->type == 'User')
-            {
                 // $data = $model_name::with('roles')->get();
-                $data = User::with('roles','cawangan')->whereHas("roles", function($q) {
+                $data = User::with('roles', 'cawangan')->whereHas('roles', function ($q) {
-                    $q->where("id",'!=', 8);})
+                    $q->where('id', '!=', 8);
+                })
                     ->get();
 
-            }
+            } else {
-            else{
                 $data = $model_name::all();
             }
 
         }
         // return view('pdf.edit',compact('data')); //page for editing
         // dd($data);
-        if($request->type =='Role')
+        if ($request->type == 'Role') {
-        {
             $pdf = PDF::loadView('pdf.tarafpdf', compact('data'));
+
             return $pdf->download('Taraf.pdf');
-        }
+        } elseif ($request->type == 'User') {
-        elseif($request->type =='User')
-        {
             // return view('pdf.edit',compact('data')); //page for editing
             $pdf = PDF::loadView('pdf.penggunapdf', compact('data'));
+
             return $pdf->download('Pengguna.pdf');
-        }
+        } elseif ($request->type == 'Permission') {
-        elseif($request->type =='Permission')
-        {
             return view('pdf.edit', compact('data')); // page for editing
             // $pdf = PDF::loadView('pdf.rolespdf',compact('data'));
             // return $pdf->download('Roles.pdf');
@@ -368,15 +355,15 @@ class PenggunaController extends Controller
 
     public function listajk()
     {
-        $alluser = User::with('roles','cawangan')->whereHas("roles", function($q) {
+        $alluser = User::with('roles', 'cawangan')->whereHas('roles', function ($q) {
-            $q->where("name",'=', 'ajk');})
+            $q->where('name', '=', 'ajk');
+        })
             ->orderBy('name', 'ASC')
             ->get();
         $allroles = Role::all();
         $allRolesPluck = $allroles->pluck('name');
         $caw = Cawangan::all();
+
         return view('parameter.listajk', compact('alluser', 'allroles', 'caw', 'allRolesPluck'));
     }
-    
 }
-       

app/Http/Controllers/ReportAllController.php

@@ -1,43 +1,24 @@
 <?php
 
 namespace App\Http\Controllers;
-use App\Events\LelongNotify;
 
-use Illuminate\Http\Request;
-use Spatie\Permission\Models\Role;
-use Spatie\Permission\Models\Permission;
-use Illuminate\Support\Facades\Auth;
-use PDF;
-use App\Models\User;
 use App\Models\Cawangan;
-use App\Models\Gadai;
-use App\Models\JenisEmas;
-use App\Models\JenisKarat;
-
-use App\Models\Simulasi;
-use App\Models\SimulasiBid;
-use App\Models\SimulasiBidMarhun;
-use App\Models\SimKarat;
-use App\Models\SimKarat_temp;
-use App\Models\CawanganSimulasi;
-
-
-use App\Models\Lelong;
 use App\Models\CawanganLelong;
+use App\Models\Customer;
+use App\Models\Gadai;
+use App\Models\Lelong;
 use App\Models\LelongBid;
 use App\Models\LelongBidder;
 use App\Models\LelongBidMarhun;
-use App\Models\LelKarat;
-use App\Models\LelKarat_temp;
-use App\Models\Resit;
-use App\Models\Customer;
 use App\Models\LelongCawangan;
 use App\Models\LelongTebus;
+use App\Models\Simulasi;
+use App\Models\SimulasiBid;
 use App\Models\Tetapan;
-use Illuminate\Support\Facades\Http;
-
-
 use Carbon\Carbon;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Http;
+use PDF;
 
 class ReportAllController extends Controller
 {
@@ -56,10 +37,8 @@ class ReportAllController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-  
+    public function lapbrglelongindexall()
-
+    {
-
-    public function lapbrglelongindexall (){
 
         $arrayinfo = [];
 
@@ -67,8 +46,7 @@ class ReportAllController extends Controller
             ->groupBy('kali')
             ->get();
 
-        foreach($lelong as $info)
+        foreach ($lelong as $info) {
-        {
             $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('kali', $info->kali)
                 ->get()
@@ -81,8 +59,8 @@ class ReportAllController extends Controller
         return view('lelongall.laporanlelongall', compact('lelong', 'arrayinfo'));
     }
 
-
+    public function lapbidaanpembidaindexall()
-    public function lapbidaanpembidaindexall (){
+    {
 
         $arrayinfo = [];
 
@@ -90,8 +68,7 @@ class ReportAllController extends Controller
             ->groupBy('kali')
             ->get();
 
-        foreach($lelong as $info)
+        foreach ($lelong as $info) {
-        {
             $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('kali', $info->kali)
                 ->get()
@@ -105,8 +82,8 @@ class ReportAllController extends Controller
 
     }
 
-    public function senarailapbidaanall (Request $request, $kali){
+    public function senarailapbidaanall(Request $request, $kali)
-
+    {
 
         $kali = $kali;
         $lelong = Lelong::where('kali', '=', $kali)->first();
@@ -119,9 +96,7 @@ class ReportAllController extends Controller
         $total_berat = 0;
         $total_hargajual = 0;
 
-
+        foreach ($cawanganlel as $cawlel) {
-        foreach($cawanganlel as $cawlel)
-        {
             $cawangan = Cawangan::where('id', '=', $cawlel->caw_id)->first();
 
             $databid = LelongBid::join('cawangan_lelong', function ($join) {
@@ -140,7 +115,6 @@ class ReportAllController extends Controller
                 ->where('cawangan_lelong.lelong_id', '=', $cawlel->lelong_id)
                 ->where('cawangan_lelong.kali', '=', $kali)->first();
 
-
             $packet = 0;
             $berat = 0;
             $hargaasas = 0;
@@ -148,9 +122,7 @@ class ReportAllController extends Controller
 
             $id = $cawlel->lelong_id;
 
-
+            foreach ($databid as $index1 => $bid) {
-            foreach($databid as $index1=>$bid)
-            {
 
                 $marhun = LelongBidMarhun::where('lelongbid_id', '=', $bid['id'])->get();
                 $berat = $berat + $bid['berat'];
@@ -158,10 +130,6 @@ class ReportAllController extends Controller
                 $hargaasas = $hargaasas + $bid['hargaasas'];
                 $hargajual = $hargajual + $bid['hargajual'];
 
-
-             
-
-
             }
 
             array_push($arraycaw, [
@@ -169,29 +137,23 @@ class ReportAllController extends Controller
                 'cawangan' => $cawangan['caw_name'],
                 't_lelong' => $lelong['tarikh_lelong'],
                 't_lelong' => $t_lelong['tarikh_lelong'],
-                'bil_marhun'=>sizeof($databid),
+                'bil_marhun' => count($databid),
                 'berat' => $berat,
                 'hargaasas' => $hargaasas,
                 'hargajual' => $hargajual,
             ]);
 
-
+            $total_marhun = $total_marhun + count($databid);
-            $total_marhun = $total_marhun + sizeof($databid);
             $total_berat = $total_berat + $berat;
             $total_hargaasas = $total_hargaasas + $hargaasas;
             $total_hargajual = $total_hargajual + $hargajual;
 
-
-
             $data = Lelong::where('kali', '=', $kali)
                 ->first();
             // dd($data);
 
         }
 
-   
-
-
         $pdf = PDF::loadView('pdf.pdfsenarailapbidaanall', compact('arraycaw',
             'total_marhun',
             'total_berat',
@@ -202,14 +164,10 @@ class ReportAllController extends Controller
 
         return $pdf->download('Senarai Lelong Pembida By Batch.pdf');
 
-
-
-        
-        
     }
 
-
+    public function laplelongindexall()
-    Public function laplelongindexall (){
+    {
 
         $arrayinfo = [];
 
@@ -217,8 +175,7 @@ class ReportAllController extends Controller
             ->groupBy('kali')
             ->get();
 
-        foreach($lelong as $info)
+        foreach ($lelong as $info) {
-        {
             $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('kali', $info->kali)
                 ->get()
@@ -227,12 +184,13 @@ class ReportAllController extends Controller
             array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo]);
 
         }
-        return view('lelongall.laplelongindexall',compact('arrayinfo','lelong'));
 
+        return view('lelongall.laplelongindexall', compact('arrayinfo', 'lelong'));
 
     }
 
-    Public function laplelongallall (Request $request, $kali){
+    public function laplelongallall(Request $request, $kali)
+    {
 
         $kali = $kali;
         $lelong = Lelong::where('kali', '=', $kali)->first();
@@ -253,8 +211,7 @@ class ReportAllController extends Controller
         $total_keuntungan = 0;
         $total_hargaasas = 0;
 
-        foreach($cawanganlel as $cawlel)
+        foreach ($cawanganlel as $cawlel) {
-        {
             $cawangan = Cawangan::where('id', '=', $cawlel->caw_id)->first();
             $databid = LelongBid::join('cawangan_lelong', function ($join) {
                 $join->on('cawangan_lelong.caw_id', '=', 'lelongbid.caw_id')
@@ -273,7 +230,6 @@ class ReportAllController extends Controller
                 ->where('cawangan_lelong.lelong_id', '=', $cawlel->lelong_id)
                 ->where('cawangan_lelong.kali', '=', $kali)->first();
 
-
             $packet = 0;
             $berat = 0;
             $nilai_marhun = 0;
@@ -285,9 +241,7 @@ class ReportAllController extends Controller
             $bakilelong = 0;
             $id = $cawlel->lelong_id;
 
-
+            foreach ($databid as $index1 => $bid) {
-            foreach($databid as $index1=>$bid)
-            {
 
                 $marhun = LelongBidMarhun::where('lelongbid_id', '=', $bid['id'])->get();
                 $berat = $berat + $bid['berat'];
@@ -297,7 +251,6 @@ class ReportAllController extends Controller
                 $hargaasas = $hargaasas + $bid['hargaasas'];
                 $cajlelong = $cajlelong + $bid['cajlelong'];
 
-         
             }
 
             array_push($arraycaw, [
@@ -305,7 +258,7 @@ class ReportAllController extends Controller
                 'cawangan' => $cawangan['caw_name'],
                 't_lelong' => $lelong['tarikh_lelong'],
                 't_simulasi' => $t_lelong['tarikh_lelong'],
-                'bil_marhun'=>sizeof($databid),
+                'bil_marhun' => count($databid),
                 'berat' => $berat,
                 'n_marhun' => $nilai_marhun,
                 'pinjaman' => $pinjaman,
@@ -317,8 +270,7 @@ class ReportAllController extends Controller
                 'bakilelong' => $bakilelong,
             ]);
 
-
+            $total_marhun = $total_marhun + count($databid);
-            $total_marhun = $total_marhun + sizeof($databid);
             $total_berat = $total_berat + $berat;
             $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
             $total_pinjaman = $total_pinjaman + $pinjaman;
@@ -330,7 +282,6 @@ class ReportAllController extends Controller
 
         }
 
-
         $pdf = PDF::loadView('pdf.pdflaplelongall', compact('arraycaw',
             'total_marhun',
             'total_berat',
@@ -342,23 +293,20 @@ class ReportAllController extends Controller
             'total_keuntungan',
             'total_nilaimarhun',
             'kali'))
-
             ->setPaper('a4', 'potrait');
-        return $pdf->download('Laporan Lelong Keseluruhan.pdf');
 
+        return $pdf->download('Laporan Lelong Keseluruhan.pdf');
 
     }
 
-
+    public function lelongtebus($lelong_id, $kodcaw)
-
+    {
-    Public function lelongtebus ($lelong_id, $kodcaw){
 
         $total_berat = 0;
         $total_hargaasas = 0;
         $total_hargalelong = 0;
         $arrayinfocaw = [];
 
-
         $info = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
             ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
             ->where('cawangan.caw_code', $kodcaw)
@@ -367,8 +315,7 @@ class ReportAllController extends Controller
             ->groupBy('lelong_id')
             ->get();
 
-        foreach($info as $laporancaw)
+        foreach ($info as $laporancaw) {
-        {
             $cawangan = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('cawangan.caw_code', $kodcaw)
                 ->where('lelong_id', $laporancaw['lelong_id'])
@@ -378,7 +325,6 @@ class ReportAllController extends Controller
         }
         // dd($arrayinfocaw);
 
-
         $laporantebus = LelongTebus::where('kodcaw', $kodcaw)
             ->get()->toArray();
         // dd($laporantebus);
@@ -391,15 +337,14 @@ class ReportAllController extends Controller
 
         // }
 
-
         $pdf = PDF::loadView('pdf.pdflelongtebus', compact('lelong_id', 'info', 'laporantebus', 'total_berat', 'total_hargaasas', 'total_hargalelong', 'arrayinfocaw'))
             ->setPaper('a4', 'potrait');
 
         return $pdf->download('Laporan Barang Lelong Pembida.pdf');
     }
 
-
+    public function simulasireport($simulasi_id, $cawid)
-     Public function simulasireport ($simulasi_id, $cawid){
+    {
 
         $keuntungan = 0;
 
@@ -462,9 +407,7 @@ class ReportAllController extends Controller
                 'baki' => $cal['baki'],
             ]);
 
-
             $datacaw = Cawangan::where('id', '=', $cawid)
-         
                 ->get();
         }
 
@@ -475,9 +418,8 @@ class ReportAllController extends Controller
 
     }
 
-
+    public function senaraibrglelongall(Request $request, $kali)
-  public function senaraibrglelongall(Request $request, $kali){
+    {
-     
 
         $kali = $kali;
         $lelong = Lelong::where('kali', '=', $kali)->first();
@@ -486,16 +428,13 @@ class ReportAllController extends Controller
         $cawanganlel = CawanganLelong::where('kali', '=', $kali)->get();
         // dd($cawanganlel);
 
-        
         $arraycaw = [];
 
         $total_marhun = 0;
         $total_berat = 0;
         $total_hargaasas = 0;
 
-
+        foreach ($cawanganlel as $cawlel) {
-        foreach($cawanganlel as $cawlel)
-        {
             $cawangan = Cawangan::where('id', '=', $cawlel->caw_id)->first();
             // $brglel = LelongBid::join('cawangan_lelong','cawangan_lelong.caw_id','=','lelongbid.caw_id')
             $brglel = LelongBid::join('cawangan_lelong', function ($join) {
@@ -518,28 +457,25 @@ class ReportAllController extends Controller
             $hargaasas = 0;
             $id = $cawlel->lelong_id;
 
-            
+            foreach ($brglel as $index1 => $bid) {
-            foreach($brglel as $index1=>$bid)
-            {
 
                 $marhun = LelongBidMarhun::where('lelongbid_id', '=', $bid['id'])->get();
                 $berat = $berat + $bid['berat'];
                 $hargaasas = $hargaasas + $bid['hargaasas'];
 
-
             }
 
             array_push($arraycaw, [
                 'id_cawangan' => $cawangan['id'],
                 'cawangan' => $cawangan['caw_name'],
                 't_lelong' => $t_lelong['tarikh_lelong'],
-                'bil_marhun'=>sizeof($brglel),
+                'bil_marhun' => count($brglel),
                 'berat' => $berat,
                 'hargaasas' => $hargaasas,
 
             ]);
 
-            $total_marhun = $total_marhun + sizeof($brglel);
+            $total_marhun = $total_marhun + count($brglel);
             $total_berat = $total_berat + $berat;
             $total_hargaasas = $total_hargaasas + $hargaasas;
 
@@ -554,8 +490,8 @@ class ReportAllController extends Controller
         return $pdf->download('Senarai Barang Lelong All.pdf');
     }
 
-
+    public function laporanlelongbycaw()
-    Public function laporanlelongbycaw (){
+    {
 
         $cawangan_all = Cawangan::with(['cawanganLelong'])
             ->withCount(['cawanganLelong' => function ($query) {
@@ -567,12 +503,14 @@ class ReportAllController extends Controller
         foreach ($cawangan_all as $index3 => $cawangan) {
             $cawangan_all_groupby_caw = $cawangan->groupBy('caw_code');
 
-                $cawangan_all[$index3]["cawangan_info"] = $cawangan;
+            $cawangan_all[$index3]['cawangan_info'] = $cawangan;
         }
+
         return view('lelong.laporanlelongbycaw', compact('cawangan_all'));
     }
 
-    Public function laporanlelongbycawdetail ($cawid){
+    public function laporanlelongbycawdetail($cawid)
+    {
 
         $bycaw_all = CawanganLelong::with(['cawangan', 'lelong'])
             ->where('caw_id', $cawid)
@@ -587,17 +525,18 @@ class ReportAllController extends Controller
         foreach ($bycaw_all as $index3 => $listbatch) {
             // dd($listbatch->lelong);
             $bycaw_all_groupby_caw = $listbatch->groupBy('lelong_id');
-                $bycaw_all[$index3]["lelong_info"] = $listbatch->lelong;
+            $bycaw_all[$index3]['lelong_info'] = $listbatch->lelong;
-                $bycaw_all[$index3]["nama_caw"] = $listbatch->cawangan->caw_name;
+            $bycaw_all[$index3]['nama_caw'] = $listbatch->cawangan->caw_name;
             // $bycaw_all[$index3]["nama_caw"] = $listbatch->cawangan;
         }
+
         // dd($bycaw_all);
         return view('lelong.laporanlelongbycawangan', compact('bycaw_all', 'cawanganDetail'));
 
-
     }
 
-    public function laporanlelongbycawdetailpdf($lelong_id,$kodcaw){
+    public function laporanlelongbycawdetailpdf($lelong_id, $kodcaw)
+    {
 
         $kodcaw = $kodcaw;
         $caw = Cawangan::where('caw_code', '=', $kodcaw)
@@ -622,8 +561,7 @@ class ReportAllController extends Controller
             ->groupBy('lelong_id')
             ->get();
 
-        foreach($info as $laporancaw)
+        foreach ($info as $laporancaw) {
-        {
             $cawangan = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('lelong_id', $laporancaw['lelong_id'])
                 ->where('cawangan.caw_code', '=', $kodcaw)
@@ -640,8 +578,7 @@ class ReportAllController extends Controller
                 'lelongbid.cajlelong', 'lelongbidder.hargabida', 'lelongbid.baki', 'lelongbid.hargaasas', 'lelongbidder.nama_bidder', 'lelongbid.tagujrah', 'lelongbid.ujrah', 'lelongbid.onepercent')
             ->get()->toArray();
 
-        foreach($laporanlelong as $index1=>$laplelong)
+        foreach ($laporanlelong as $index1 => $laplelong) {
-        {
             $margin = ($laplelong['pinjaman'] / $laplelong['nilaimarhun']) * 100;
 
             $total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun'];
@@ -658,13 +595,11 @@ class ReportAllController extends Controller
 
         }
 
-
         $pdf = PDF::loadView('pdf.laporanlelfullcaw', compact('info', 'lelong_id', 'laporanlelong', 'lelong_id', 'total_nmarhun', 'total_pembiayaan',
             'total_upahsimpan', 'total_cajlelong', 'total_hargalelong', 'total_bakirugi', 'total_hargaasas', 'arrayinfocaw', 'total_ujrah', 'total_onepercent'))
-
             ->setPaper('a4', 'landscape');
-        return $pdf->download('Laporan Lelong Keseluruhan.pdf');
 
+        return $pdf->download('Laporan Lelong Keseluruhan.pdf');
 
     }
 
@@ -674,6 +609,7 @@ class ReportAllController extends Controller
         $currentDate = $currentDate->toDateString();
         $caw = Cawangan::all();
         $tetapan = Tetapan::where('id', '=', 1)->first();
+
         return view('laporan.carianbydate', compact('caw', 'tetapan', 'currentDate'));
     }
 
@@ -684,8 +620,7 @@ class ReportAllController extends Controller
         $tarikh_hingga = date('Y-m-d', strtotime($request->tarikh_hingga));
         $t_hingga = $request->tarikh_hingga;
 
-        if($t_dari != null || $t_hingga != null)
+        if ($t_dari != null || $t_hingga != null) {
-        {
             $cawangan_all = Cawangan::orderBy('caw_name')->get();
             $senarai = [];
             $total_bil_lelong = 0;
@@ -717,12 +652,9 @@ class ReportAllController extends Controller
                 $total_baki = $getsurat->sum('baki');
                 $total_pembiayaan = $getsurat->sum('pinjaman');
                 foreach ($surat as $index => $sag) {
-                            if($sag['baki'] > 0)
+                    if ($sag['baki'] > 0) {
-                            {
                         $bakilelong = $bakilelong + $sag['baki'];
-                            }
+                    } else {
-                            else
-                            {
                         $rugilelong = $rugilelong - $sag['baki'];
                     }
                 }
@@ -753,15 +685,12 @@ class ReportAllController extends Controller
                 $jum_baki += $bakilelong;
                 $jum_rugi += $rugilelong;
             }
-            if($total_bil_lelong == 0)
+            if ($total_bil_lelong == 0) {
-            {
                 return redirect()->route('reportbydate.laporanlelongbydate')
                     ->with('failed', 'Tiada surat lelong');
             }
 
-            
+            if ($request->type == 'pdf') {
-            if($request->type == 'pdf')
-            {
                 $pdf = PDF::loadView('laporan.senaraitemplaporanbydate_pdf', compact('t_dari',
                     't_hingga',
                     'getsurat',
@@ -769,6 +698,7 @@ class ReportAllController extends Controller
                     'tarikh_dari',
                     'tarikh_hingga', 'jum_billelong', 'jum_berat', 'jum_nilaimarhun', 'jum_pembiayaan', 'jum_hargajual', 'jum_bakiupah', 'jum_baki', 'jum_cajlelong', 'jum_rugi'))
                     ->setPaper('a4', 'landscape');
+
                 return $pdf->download('laporan lelong dari'.$t_dari.'hingga'.$t_hingga.'.pdf');
             } else {
 
@@ -780,15 +710,14 @@ class ReportAllController extends Controller
                     'tarikh_hingga', 'jum_billelong', 'jum_berat', 'jum_nilaimarhun', 'jum_pembiayaan', 'jum_hargajual', 'jum_bakiupah', 'jum_baki', 'jum_cajlelong', 'jum_rugi'
                 ));
             }
-        }
+        } else {
-        else
-        {
             return redirect()->route('reportbydate.laporanlelongbydate')
                 ->with('failed', 'Sila Masukkan Tarikh');
         }
     }
 
-    Public function marhunpermatabycaw (){
+    public function marhunpermatabycaw()
+    {
 
         $cawangan_all = Cawangan::orderBy('caw_name', 'ASC')
             ->get();
@@ -796,12 +725,14 @@ class ReportAllController extends Controller
         foreach ($cawangan_all as $index3 => $cawangan) {
             $cawangan_all_groupby_caw = $cawangan->groupBy('caw_code');
 
-                $cawangan_all[$index3]["cawangan_info"] = $cawangan;
+            $cawangan_all[$index3]['cawangan_info'] = $cawangan;
         }
+
         return view('laporan.marhunpermatabycaw', compact('cawangan_all'));
     }
 
-    Public function marhunpermatabycawdetail($cawid){
+    public function marhunpermatabycawdetail($cawid)
+    {
         $senarai = [];
         $cawangan = Cawangan::where('id', '=', $cawid)->first();
         $cawanganDetail = $cawangan->caw_name;
@@ -817,11 +748,13 @@ class ReportAllController extends Controller
             'lelong' => $datalelong ? $datalelong : '',
         ];
         array_push($senarai, $data);
+
         // dd($bycaw_all);
         return view('laporan.marhunpermatabycawangan', compact('senarai', 'cawanganDetail', 'cawid'));
     }
 
-    Public function marhunpermatabycawdetailbatch($kodcaw,$batchno){
+    public function marhunpermatabycawdetailbatch($kodcaw, $batchno)
+    {
         $senarai = [];
         $cawangan = Cawangan::where('caw_code', '=', $kodcaw)->first();
         $cawanganDetail = $cawangan->caw_name;
@@ -839,13 +772,14 @@ class ReportAllController extends Controller
             'lelong' => $datalelong ? $datalelong : '',
         ];
         array_push($senarai, $data);
+
         // dd($senarai);
         return view('laporan.marhunpermatabycawanganbybatch', compact('senarai', 'cawanganDetail'));
 
-
     }
 
-    Public function marhunpermatabycawdetailall($cawid){
+    public function marhunpermatabycawdetailall($cawid)
+    {
         $senarai = [];
         $cawangan = Cawangan::where('id', '=', $cawid)->first();
         $cawanganDetail = $cawangan->caw_name;
@@ -860,13 +794,14 @@ class ReportAllController extends Controller
             'lelong' => $datalelong ? $datalelong : '',
         ];
         array_push($senarai, $data);
+
         // dd($bycaw_all);
         return view('laporan.marhunpermatabycawanganall', compact('senarai', 'cawanganDetail', 'cawid'));
 
-
     }
 
-    Public function marhunpermatabycawdetailallpdf($cawid, request $request){
+    public function marhunpermatabycawdetailallpdf($cawid, request $request)
+    {
         $senarai = [];
         $cawangan = Cawangan::where('id', '=', $cawid)->first();
         // dd($cawangan);
@@ -881,25 +816,23 @@ class ReportAllController extends Controller
             'lelong' => $datalelong ? $datalelong : '',
         ];
         array_push($senarai, $data);
-        if($request->type == 'excel')
+        if ($request->type == 'excel') {
-        {
 
             return view('kpi.datakpibycawdetailall_excel', compact('collection_datakpi', 'kodcaw'));
 
-        }
+        } elseif ($request->type == 'pdf') {
-        elseif($request->type == 'pdf')
-        {
             $pdf = PDF::loadView('laporan.keseluruhanmarhunpermata_pdf', compact('senarai', 'cawanganDetail'))
                 ->setPaper('a4', 'landscape');
 
             return $pdf->download('Marhun Permata Keseluruhan '.$cawanganDetail.'.pdf');
         }
-        return view('laporan.marhunpermatabycawanganall',compact('senarai','cawanganDetail'));
 
+        return view('laporan.marhunpermatabycawanganall', compact('senarai', 'cawanganDetail'));
 
     }
 
-    Public function marhunpermatabycawdetailallT($cawid){
+    public function marhunpermatabycawdetailallT($cawid)
+    {
         $senarai = [];
         $cawangan = Cawangan::where('id', '=', $cawid)->first();
         $cawanganDetail = $cawangan->caw_name;
@@ -914,13 +847,14 @@ class ReportAllController extends Controller
             'lelong' => $datalelong ? $datalelong : '',
         ];
         array_push($senarai, $data);
+
         // dd($bycaw_all);
         return view('laporan.marhunpermatabycawanganallT', compact('senarai', 'cawanganDetail', 'cawid'));
 
-
     }
 
-    Public function marhunpermatabycawdetailallpdfT($cawid, request $request){
+    public function marhunpermatabycawdetailallpdfT($cawid, request $request)
+    {
         $senarai = [];
         $cawangan = Cawangan::where('id', '=', $cawid)->first();
         // dd($cawangan);
@@ -935,14 +869,11 @@ class ReportAllController extends Controller
             'lelong' => $datalelong ? $datalelong : '',
         ];
         array_push($senarai, $data);
-        if($request->type == 'excel')
+        if ($request->type == 'excel') {
-        {
 
             return view('kpi.datakpibycawdetailall_excel', compact('collection_datakpi', 'kodcaw'));
 
-        }
+        } elseif ($request->type == 'pdf') {
-        elseif($request->type == 'pdf')
-        {
             $pdf = PDF::loadView('laporan.keseluruhanmarhunpermata_pdfT', compact('senarai', 'cawanganDetail'))
                 ->setPaper('a4', 'landscape');
 
@@ -950,10 +881,10 @@ class ReportAllController extends Controller
         }
         // return view('laporan.marhunpermatabycawanganall',compact('senarai','cawanganDetail'));
 
-
     }
 
-    Public function marhunpermatabycawdetailT($cawid){
+    public function marhunpermatabycawdetailT($cawid)
+    {
         $senarai = [];
         $cawangan = Cawangan::where('id', '=', $cawid)->first();
         $cawanganDetail = $cawangan->caw_name;
@@ -968,11 +899,13 @@ class ReportAllController extends Controller
             'lelong' => $datalelong ? $datalelong : '',
         ];
         array_push($senarai, $data);
+
         // dd($bycaw_all);
         return view('laporan.marhunpermatabycawanganT', compact('senarai', 'cawanganDetail', 'cawid'));
     }
 
-    Public function marhunpermatabycawdetailbatchT($kodcaw,$batchno){
+    public function marhunpermatabycawdetailbatchT($kodcaw, $batchno)
+    {
         $senarai = [];
         $cawangan = Cawangan::where('caw_code', '=', $kodcaw)->first();
         $cawanganDetail = $cawangan->caw_name;
@@ -990,16 +923,9 @@ class ReportAllController extends Controller
             'lelong' => $datalelong ? $datalelong : '',
         ];
         array_push($senarai, $data);
+
         // dd($senarai);
         return view('laporan.marhunpermatabycawanganbybatchT', compact('senarai', 'cawanganDetail'));
 
-
     }
-
-
-    
-  
-
- 
 }
-       

app/Http/Controllers/ReportCawanganController.php

@@ -1,39 +1,20 @@
 <?php
 
 namespace App\Http\Controllers;
-use App\Events\LelongNotify;
 
-use Illuminate\Http\Request;
-use Spatie\Permission\Models\Role;
-use Spatie\Permission\Models\Permission;
-use Illuminate\Support\Facades\Auth;
-use PDF;
-use App\Models\User;
 use App\Models\Cawangan;
-use App\Models\Gadai;
-use App\Models\JenisEmas;
-use App\Models\JenisKarat;
-
-use App\Models\Simulasi;
-use App\Models\SimulasiBid;
-use App\Models\SimulasiBidMarhun;
-use App\Models\SimKarat;
-use App\Models\SimKarat_temp;
-use App\Models\CawanganSimulasi;
-
-
-use App\Models\Lelong;
 use App\Models\CawanganLelong;
+use App\Models\Customer;
+use App\Models\Gadai;
+use App\Models\Lelong;
 use App\Models\LelongBid;
 use App\Models\LelongBidder;
 use App\Models\LelongBidMarhun;
-use App\Models\LelKarat;
+use App\Models\User;
-use App\Models\LelKarat_temp;
+use Illuminate\Http\Request;
-use App\Models\Resit;
+use Illuminate\Support\Facades\Auth;
-use App\Models\Customer;
-use App\Models\TransaksiKeuntungan;
-use Carbon\Carbon;
 use Illuminate\Support\Facades\Http;
+use PDF;
 
 class ReportCawanganController extends Controller
 {
@@ -53,8 +34,6 @@ class ReportCawanganController extends Controller
      * @return \Illuminate\Contracts\Support\Renderable
      */
 
-
-
     //  Laporan by cawangan
     public function laporancawindex(request $request)
     {
@@ -68,11 +47,11 @@ class ReportCawanganController extends Controller
         $cawname = Cawangan::where('caw_code', '=', $user->kodcaw)
             ->get();
 
-
         return view('lelong.laporancawindex', compact('lelongid', 'cawname'));
     }
 
-    public function laporanbrglelcaw($lelong_id){
+    public function laporanbrglelcaw($lelong_id)
+    {
 
         $user = Auth::user();
         $caw = Cawangan::where('caw_code', '=', $user->kodcaw)
@@ -87,8 +66,7 @@ class ReportCawanganController extends Controller
         $total_hargaasas = 0;
         $total_berat = 0;
 
-        foreach($brglelongcaw as $index1=>$upah)
+        foreach ($brglelongcaw as $index1 => $upah) {
-        {
 
             $total_hargaasas = $total_hargaasas + $upah['hargaasas'];
             $total_berat = $total_berat + $upah['berat'];
@@ -103,13 +81,11 @@ class ReportCawanganController extends Controller
             ->groupBy('lelong_id', 'caw_name')
             ->get()->toArray();
 
-
         $pdf = PDF::loadView('pdf.brglelcaw', compact('brglelongcaw', 'lelong_id', 'keuntungan', 'total_hargaasas', 'total_berat', 'info'))
             ->setPaper('a4', 'potrait');
 
         return $pdf->download('Senarai Barang Lelong.pdf');
 
-
     }
 
     public function indexbrgleldetailscaw(request $request)
@@ -127,7 +103,8 @@ class ReportCawanganController extends Controller
         return view('lelong.indexbrgleldetailscaw', compact('lelongid', 'cawname'));
     }
 
-    public function laporanbrgleldetailscaw($lelong_id){
+    public function laporanbrgleldetailscaw($lelong_id)
+    {
 
         $user = Auth::user();
         $caw = Cawangan::where('caw_code', '=', $user->kodcaw)
@@ -153,7 +130,6 @@ class ReportCawanganController extends Controller
 
         $arrayinfo = [];
 
-
         $lelongid = Lelong::join('cawangan_lelong', 'lelong.id', '=', 'cawangan_lelong.lelong_id')
             ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
             ->where('cawangan_lelong.lelong_id', '=', $lelong_id)
@@ -162,8 +138,7 @@ class ReportCawanganController extends Controller
             ->groupBy('lelong_id')
             ->get()->toArray();
 
-        foreach($lelongid as $laporan)
+        foreach ($lelongid as $laporan) {
-        {
             $details = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('lelong_id', $laporan['lelong_id'])
                 ->where('cawangan.caw_code', '=', $user['kodcaw'])
@@ -191,7 +166,7 @@ class ReportCawanganController extends Controller
             'berat' => $berat,
             'harga' => $harga,
             'n_marhun' => $nilai_marhun,
-            'hargaasas'=>$hargaasas
+            'hargaasas' => $hargaasas,
 
         ]);
 
@@ -200,11 +175,10 @@ class ReportCawanganController extends Controller
 
         return $pdf->download('Senarai Lelong Details.pdf');
 
-
     }
 
-
+    public function indexnamapembidacaw()
-    public function indexnamapembidacaw(){
+    {
         $user = Auth::user();
 
         $lelongid = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
@@ -217,16 +191,15 @@ class ReportCawanganController extends Controller
 
         return view('lelong.indexnamapembidacaw', compact('lelongid', 'cawname'));
 
-
     }
 
-    public function laporannamapembidacaw($lelong_id){
+    public function laporannamapembidacaw($lelong_id)
+    {
 
         $user = Auth::user();
         $caw = Cawangan::where('caw_code', '=', $user->kodcaw)
             ->first();
 
-     
         $arraydetails = [];
         $arrayinfocaw = [];
 
@@ -238,8 +211,7 @@ class ReportCawanganController extends Controller
             ->groupBy('lelong_id')
             ->get();
 
-        foreach($lelongid as $laporancaw)
+        foreach ($lelongid as $laporancaw) {
-        {
             $cawangan = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('lelong_id', $laporancaw['lelong_id'])
                 ->where('cawangan.caw_code', '=', $user['kodcaw'])
@@ -248,7 +220,6 @@ class ReportCawanganController extends Controller
             array_push($arrayinfocaw, ['laporancaw' => $laporancaw, 'cawangan' => $cawangan]);
         }
 
-
         $laporanpembida = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
             ->select('lelongbid_id', 'norujukan', 'hargaasas')
             ->where('lelongbid.lelong_id', '=', $lelong_id)
@@ -257,9 +228,7 @@ class ReportCawanganController extends Controller
             ->get()
             ->toArray();
 
-
+        foreach ($laporanpembida as $laporan) {
-        foreach($laporanpembida as $laporan)
-        {
             $details = LelongBidder::where('lelongbid_id', $laporan['lelongbid_id'])
                 ->orderBy('hargabida', 'desc')
                 ->orderBy('masa_bidaan', 'asc')
@@ -273,11 +242,10 @@ class ReportCawanganController extends Controller
 
         return $pdf->download('Senarai Nama Bidaan Pembida.pdf');
 
-
-
     }
 
-    public function indexlelfullcaw (){
+    public function indexlelfullcaw()
+    {
 
         $user = Auth::user();
 
@@ -293,7 +261,8 @@ class ReportCawanganController extends Controller
 
     }
 
-    public function laporanlelfullcaw($lelong_id){
+    public function laporanlelfullcaw($lelong_id)
+    {
 
         $user = Auth::user();
         $caw = Cawangan::where('caw_code', '=', $user->kodcaw)
@@ -318,8 +287,7 @@ class ReportCawanganController extends Controller
             ->groupBy('lelong_id')
             ->get();
 
-        foreach($info as $laporancaw)
+        foreach ($info as $laporancaw) {
-        {
             $cawangan = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('lelong_id', $laporancaw['lelong_id'])
                 ->where('cawangan.caw_code', '=', $user['kodcaw'])
@@ -336,8 +304,7 @@ class ReportCawanganController extends Controller
                 'lelongbid.cajlelong', 'lelongbidder.hargabida', 'lelongbid.baki', 'lelongbid.hargaasas', 'lelongbidder.nama_bidder', 'lelongbid.tagujrah', 'lelongbid.ujrah', 'lelongbid.onepercent')
             ->get()->toArray();
 
-        foreach($laporanlelong as $index1=>$laplelong)
+        foreach ($laporanlelong as $index1 => $laplelong) {
-        {
             $margin = ($laplelong['pinjaman'] / $laplelong['nilaimarhun']) * 100;
 
             $total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun'];
@@ -354,17 +321,16 @@ class ReportCawanganController extends Controller
 
         }
 
-
         $pdf = PDF::loadView('pdf.laporanlelfullcaw', compact('info', 'lelong_id', 'laporanlelong', 'lelong_id', 'total_nmarhun', 'total_pembiayaan',
             'total_upahsimpan', 'total_cajlelong', 'total_hargalelong', 'total_bakirugi', 'total_hargaasas', 'arrayinfocaw', 'total_ujrah', 'total_onepercent'))
-
             ->setPaper('a4', 'landscape');
-        return $pdf->download('Laporan Lelong Keseluruhan.pdf');
 
+        return $pdf->download('Laporan Lelong Keseluruhan.pdf');
 
     }
 
-    public function indexbrglelpembidacaw(){
+    public function indexbrglelpembidacaw()
+    {
 
         $user = Auth::user();
 
@@ -380,7 +346,8 @@ class ReportCawanganController extends Controller
 
     }
 
-    public function laporanbrglelpembidacaw($lelong_id){
+    public function laporanbrglelpembidacaw($lelong_id)
+    {
 
         $user = Auth::user();
         $caw = Cawangan::where('caw_code', '=', $user->kodcaw)
@@ -391,7 +358,6 @@ class ReportCawanganController extends Controller
         $total_hargalelong = 0;
         $arrayinfocaw = [];
 
-
         $info = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
             ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
             ->where('cawangan_lelong.lelong_id', '=', $lelong_id)
@@ -401,8 +367,7 @@ class ReportCawanganController extends Controller
             ->get();
         // dd($info);
 
-        foreach($info as $laporancaw)
+        foreach ($info as $laporancaw) {
-        {
             $cawangan = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('lelong_id', $laporancaw['lelong_id'])
                 ->where('cawangan.caw_code', '=', $user['kodcaw'])
@@ -423,17 +388,14 @@ class ReportCawanganController extends Controller
             $total_hargaasas = $total_hargaasas + $totalbrglelpembida['hargaasas'];
             $total_hargalelong = $total_hargalelong + $totalbrglelpembida['hargabida'];
 
-
         }
 
-
         $pdf = PDF::loadView('pdf.laporanbrglelpembidacaw', compact('lelong_id', 'info', 'brglelpembida', 'total_berat', 'total_hargaasas', 'total_hargalelong', 'arrayinfocaw'))
             ->setPaper('a4', 'potrait');
 
         return $pdf->download('Laporan Barang Lelong Pembida.pdf');
     }
 
-
     public function sandarankpkt(request $request)
     {
         $user = Auth::user();
@@ -446,7 +408,6 @@ class ReportCawanganController extends Controller
         $cawname = Cawangan::where('caw_code', '=', $user->kodcaw)
             ->get();
 
- 
         return view('lelongkhas.sandarankpkt', compact('lelongid', 'cawname'));
     }
 
@@ -462,9 +423,9 @@ class ReportCawanganController extends Controller
         $cawname = Cawangan::where('caw_code', '=', $user->kodcaw)
             ->get();
 
- 
         return view('lelongkhas.sandaranpembida', compact('lelongid', 'cawname'));
     }
+
     public function cetaksandarankpkt(request $request)
     {
         $lelong_id = $request->lelong_id;
@@ -485,8 +446,7 @@ class ReportCawanganController extends Controller
         $total_pinj10 = 0;
         $total_sumpinj10 = 0;
 
-        foreach($brglelongcaw as $index1=>$upah)
+        foreach ($brglelongcaw as $index1 => $upah) {
-        {
             $pinj10 = $upah['pinjaman'] * 0.10;
             $sumpinj10 = $upah['pinjaman'] + ($upah['pinjaman'] * 0.10);
             $total_pinj10 = $total_pinj10 + $pinj10;
@@ -512,7 +472,6 @@ class ReportCawanganController extends Controller
 
         return $pdf->download('Senarai Sandaran KPKT.pdf');
 
-
     }
 
     public function cetaksandaranpembida(request $request)
@@ -535,8 +494,7 @@ class ReportCawanganController extends Controller
         $total_pinj10 = 0;
         $total_sumpinj10 = 0;
 
-        foreach($brglelongcaw as $index1=>$upah)
+        foreach ($brglelongcaw as $index1 => $upah) {
-        {
             $pinj10 = $upah['pinjaman'] * 0.10;
             $sumpinj10 = $upah['pinjaman'] + ($upah['pinjaman'] * 0.10);
             $total_pinj10 = $total_pinj10 + $pinj10;
@@ -562,8 +520,8 @@ class ReportCawanganController extends Controller
 
         return $pdf->download('Senarai Sandaran Pembida.pdf');
 
-
     }
+
     public function jadualN(request $request)
     {
         $user = Auth::user();
@@ -576,9 +534,9 @@ class ReportCawanganController extends Controller
         $cawname = Cawangan::where('caw_code', '=', $user->kodcaw)
             ->get();
 
-
         return view('lelongkhas.jadualN', compact('lelongid', 'cawname'));
     }
+
     public function cetakjadualN(request $request)
     {
         $totalbakipjm = 0;
@@ -640,8 +598,8 @@ class ReportCawanganController extends Controller
 
         return $pdf->download('Jadual N.pdf');
 
-
     }
+
     public function jadualO(request $request)
     {
         $user = Auth::user();
@@ -654,9 +612,9 @@ class ReportCawanganController extends Controller
         $cawname = Cawangan::where('caw_code', '=', $user->kodcaw)
             ->get();
 
-
         return view('lelongkhas.jadualO', compact('lelongid', 'cawname'));
     }
+
     public function cetakjadualO(request $request)
     {
         $totalbakipjm = 0;
@@ -719,7 +677,6 @@ class ReportCawanganController extends Controller
 
         return $pdf->download('Jadual O.pdf');
 
-
     }
 
     public function laporanlelong(request $request)
@@ -820,7 +777,6 @@ class ReportCawanganController extends Controller
             ->get()->toArray();
         //   dd($info);
 
-       
         // dd($bakilelong);
 
         //   return view('pdfkhas.cetaklaporanlelong',compact('marhuns','lelong_id','info','totalbakipjm','totalpinjaman','totalhargaasas','totalbakiupah','totalcajlelong','totalhargajual','totalbaki','totalnilaimarhun','totalbakilelong','totalrugilelong'));
@@ -829,8 +785,8 @@ class ReportCawanganController extends Controller
 
         return $pdf->download('Laporan Lelongan.pdf');
 
-
     }
+
     public function laporantuntutbaki(request $request)
     {
         $user = Auth::user();
@@ -910,7 +866,8 @@ class ReportCawanganController extends Controller
 
     }
 
-  public function indexubahmarhun (){
+    public function indexubahmarhun()
+    {
 
         $arraydetails = [];
 
@@ -930,9 +887,7 @@ class ReportCawanganController extends Controller
             ->toArray();
         // dd($laporan);
 
-
+        foreach ($laporan as $brg) {
-    foreach($laporan as $brg)
-    {
             $details = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('lelong_id', $brg['lelong_id'])
                 ->where('cawangan.caw_code', '=', $user['kodcaw'])
@@ -943,12 +898,12 @@ class ReportCawanganController extends Controller
             array_push($arraydetails, ['brg' => $brg, 'detailsbrg' => $details]);
         }
 
-
         return view('marhun.ubahmarhuncaw', compact('arraydetails'));
 
     }
 
-    Public function marhunpermatabycaw (){
+    public function marhunpermatabycaw()
+    {
         $user = Auth::user();
         $cawangan_all = Cawangan::where('caw_code', '=', $user->kodcaw)
             ->get();
@@ -956,12 +911,14 @@ class ReportCawanganController extends Controller
         foreach ($cawangan_all as $index3 => $cawangan) {
             $cawangan_all_groupby_caw = $cawangan->groupBy('caw_code');
 
-                $cawangan_all[$index3]["cawangan_info"] = $cawangan;
+            $cawangan_all[$index3]['cawangan_info'] = $cawangan;
         }
+
         return view('laporan.marhunpermatabycaw', compact('cawangan_all'));
     }
 
-    Public function marhunpermatabycawdetail($cawid){
+    public function marhunpermatabycawdetail($cawid)
+    {
         $senarai = [];
         $cawangan = Cawangan::where('id', '=', $cawid)->first();
         $cawanganDetail = $cawangan->caw_name;
@@ -976,11 +933,13 @@ class ReportCawanganController extends Controller
             'lelong' => $datalelong ? $datalelong : '',
         ];
         array_push($senarai, $data);
+
         // dd($bycaw_all);
         return view('laporan.marhunpermatabycawangan', compact('senarai', 'cawanganDetail', 'cawid'));
     }
 
-    Public function marhunpermatabycawdetailbatch($kodcaw,$batchno){
+    public function marhunpermatabycawdetailbatch($kodcaw, $batchno)
+    {
         $senarai = [];
         $cawangan = Cawangan::where('caw_code', '=', $kodcaw)->first();
         $cawanganDetail = $cawangan->caw_name;
@@ -998,13 +957,14 @@ class ReportCawanganController extends Controller
             'lelong' => $datalelong ? $datalelong : '',
         ];
         array_push($senarai, $data);
+
         // dd($senarai);
         return view('laporan.marhunpermatabycawanganbybatch', compact('senarai', 'cawanganDetail'));
 
-
     }
 
-    Public function marhunpermatabycawdetailall($cawid){
+    public function marhunpermatabycawdetailall($cawid)
+    {
         $senarai = [];
         $cawangan = Cawangan::where('id', '=', $cawid)->first();
         $cawanganDetail = $cawangan->caw_name;
@@ -1020,11 +980,13 @@ class ReportCawanganController extends Controller
             'lelong' => $datalelong ? $datalelong : '',
         ];
         array_push($senarai, $data);
+
         // dd($bycaw_all);
         return view('laporan.marhunpermatabycawanganall', compact('senarai', 'cawanganDetail', 'cawid'));
     }
 
-    Public function marhunpermatabycawdetailallpdf($cawid, request $request){
+    public function marhunpermatabycawdetailallpdf($cawid, request $request)
+    {
         $senarai = [];
         $cawangan = Cawangan::where('id', '=', $cawid)->first();
         // dd($cawangan);
@@ -1039,23 +1001,21 @@ class ReportCawanganController extends Controller
             'lelong' => $datalelong ? $datalelong : '',
         ];
         array_push($senarai, $data);
-        if($request->type == 'excel')
+        if ($request->type == 'excel') {
-        {
             return view('kpi.datakpibycawdetailall_excel', compact('collection_datakpi', 'kodcaw'));
-        }
+        } elseif ($request->type == 'pdf') {
-        elseif($request->type == 'pdf')
-        {
             $pdf = PDF::loadView('laporan.keseluruhanmarhunpermata_pdf', compact('senarai', 'cawanganDetail'))
                 ->setPaper('a4', 'landscape');
 
             return $pdf->download('Marhun Permata Keseluruhan '.$cawanganDetail.'.pdf');
         }
-        return view('laporan.marhunpermatabycawanganall',compact('senarai','cawanganDetail'));
 
+        return view('laporan.marhunpermatabycawanganall', compact('senarai', 'cawanganDetail'));
 
     }
 
-    Public function marhunpermatabycawdetailallT($cawid){
+    public function marhunpermatabycawdetailallT($cawid)
+    {
         $senarai = [];
         $cawangan = Cawangan::where('id', '=', $cawid)->first();
         $cawanganDetail = $cawangan->caw_name;
@@ -1070,13 +1030,14 @@ class ReportCawanganController extends Controller
             'lelong' => $datalelong ? $datalelong : '',
         ];
         array_push($senarai, $data);
+
         // dd($bycaw_all);
         return view('laporan.marhunpermatabycawanganallT', compact('senarai', 'cawanganDetail', 'cawid'));
 
-
     }
 
-    Public function marhunpermatabycawdetailallpdfT($cawid, request $request){
+    public function marhunpermatabycawdetailallpdfT($cawid, request $request)
+    {
         $senarai = [];
         $cawangan = Cawangan::where('id', '=', $cawid)->first();
         // dd($cawangan);
@@ -1091,14 +1052,11 @@ class ReportCawanganController extends Controller
             'lelong' => $datalelong ? $datalelong : '',
         ];
         array_push($senarai, $data);
-        if($request->type == 'excel')
+        if ($request->type == 'excel') {
-        {
 
             return view('kpi.datakpibycawdetailall_excel', compact('collection_datakpi', 'kodcaw'));
 
-        }
+        } elseif ($request->type == 'pdf') {
-        elseif($request->type == 'pdf')
-        {
             $pdf = PDF::loadView('laporan.keseluruhanmarhunpermata_pdfT', compact('senarai', 'cawanganDetail'))
                 ->setPaper('a4', 'landscape');
 
@@ -1106,10 +1064,10 @@ class ReportCawanganController extends Controller
         }
         // return view('laporan.marhunpermatabycawanganall',compact('senarai','cawanganDetail'));
 
-
     }
 
-    Public function marhunpermatabycawdetailT($cawid){
+    public function marhunpermatabycawdetailT($cawid)
+    {
         $senarai = [];
         $cawangan = Cawangan::where('id', '=', $cawid)->first();
         $cawanganDetail = $cawangan->caw_name;
@@ -1124,11 +1082,13 @@ class ReportCawanganController extends Controller
             'lelong' => $datalelong ? $datalelong : '',
         ];
         array_push($senarai, $data);
+
         // dd($bycaw_all);
         return view('laporan.marhunpermatabycawangan', compact('senarai', 'cawanganDetail', 'cawid'));
     }
 
-    Public function marhunpermatabycawdetailbatchT($kodcaw,$batchno){
+    public function marhunpermatabycawdetailbatchT($kodcaw, $batchno)
+    {
         $senarai = [];
         $cawangan = Cawangan::where('caw_code', '=', $kodcaw)->first();
         $cawanganDetail = $cawangan->caw_name;
@@ -1146,22 +1106,9 @@ class ReportCawanganController extends Controller
             'lelong' => $datalelong ? $datalelong : '',
         ];
         array_push($senarai, $data);
+
         // dd($senarai);
         return view('laporan.marhunpermatabycawanganbybatchT', compact('senarai', 'cawanganDetail'));
 
-
     }
-
-
-    
-
-    
-
-
-
-    
-  
-
- 
 }
-       

app/Http/Controllers/ReportController.php

@@ -1,43 +1,27 @@
 <?php
 
 namespace App\Http\Controllers;
-use App\Events\LelongNotify;
 
-use Illuminate\Http\Request;
-use Spatie\Permission\Models\Role;
-use Spatie\Permission\Models\Permission;
-use Illuminate\Support\Facades\Auth;
-use PDF;
-use App\Models\User;
 use App\Models\Cawangan;
-use App\Models\Gadai;
-use App\Models\JenisEmas;
-use App\Models\JenisKarat;
-
-use App\Models\Simulasi;
-use App\Models\SimulasiBid;
-use App\Models\SimulasiBidMarhun;
-use App\Models\SimKarat;
-use App\Models\SimKarat_temp;
-use App\Models\CawanganSimulasi;
-
-
-use App\Models\Lelong;
 use App\Models\CawanganLelong;
+use App\Models\Customer;
+use App\Models\Gadai;
+use App\Models\LelKarat;
+use App\Models\Lelong;
 use App\Models\LelongBid;
 use App\Models\LelongBidder;
 use App\Models\LelongBidMarhun;
-use App\Models\LelKarat;
-use App\Models\LelKarat_temp;
-use App\Models\Resit;
-use App\Models\Customer;
 use App\Models\LelongTebus;
-use App\Models\Pengesahan;
-use App\Models\TransaksiKeuntungan;
-use Illuminate\Support\Facades\DB;
-
-use Carbon\Carbon;
 use App\Models\LogUser;
+use App\Models\Pengesahan;
+use App\Models\Simulasi;
+use App\Models\SimulasiBid;
+use App\Models\TransaksiKeuntungan;
+use App\Models\User;
+use Carbon\Carbon;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use PDF;
 
 class ReportController extends Controller
 {
@@ -56,10 +40,8 @@ class ReportController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-  
+    public function lapbrglelongindex()
-
+    {
-
-    public function lapbrglelongindex (){
 
         $arraydetails = [];
 
@@ -70,8 +52,7 @@ class ReportController extends Controller
             ->get()
             ->toArray();
 
-        foreach($laporanpembida as $laporan)
+        foreach ($laporanpembida as $laporan) {
-        {
             $details = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('lelong_id', $laporan['lelong_id'])
                 ->distinct()
@@ -84,8 +65,8 @@ class ReportController extends Controller
         return view('lelong.laporanlelong', compact('arraydetails'));
     }
 
-    public function senaraibrglelong($lelong_id,  $kodcaw){
+    public function senaraibrglelong($lelong_id, $kodcaw)
-     
+    {
 
         $arraydetails = [];
         $arrayinfo = [];
@@ -100,27 +81,21 @@ class ReportController extends Controller
         $lelong_bid = $test->lelongBid
             ->where('kodcaw', '=', $kodcaw);
 
-
-
         $keuntungan = 0;
         $total_hargaasas = 0;
         $total_berat = 0;
 
-
-        
         $total_hargaasas = $lelong_bid->sum('hargaasas');
         $total_berat = $lelong_bid->sum('berat');
 
-     
-
-
         $pdf = PDF::loadView('pdf.listlelong', compact('test', 'cawangan', 'lelong_bid', 'total_hargaasas', 'total_berat'))
             ->setPaper('a4', 'potrait');
 
         return $pdf->download('Senarai Barang Lelong.pdf');
     }
 
-    public function lapbrglelongdetailsindex (){
+    public function lapbrglelongdetailsindex()
+    {
 
         $arraydetails = [];
 
@@ -131,8 +106,7 @@ class ReportController extends Controller
             ->get()
             ->toArray();
 
-        foreach($brgdetails as $brg)
+        foreach ($brgdetails as $brg) {
-        {
             $details = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('lelong_id', $brg['lelong_id'])
                 ->distinct()
@@ -145,7 +119,8 @@ class ReportController extends Controller
         return view('lelong.brgleldetails', compact('arraydetails'));
     }
 
-    public function senaraibrglelongdetails ($lelong_id, $kodcaw){
+    public function senaraibrglelongdetails($lelong_id, $kodcaw)
+    {
 
         $lelongs = LelongBid::where('lelong_id', '=', $lelong_id)
             ->where('lelongbid.kodcaw', $kodcaw)
@@ -167,7 +142,6 @@ class ReportController extends Controller
 
         $arrayinfo = [];
 
-
         $lelongid = Lelong::join('cawangan_lelong', 'lelong.id', '=', 'cawangan_lelong.lelong_id')
             ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
             ->where('cawangan.caw_code', $kodcaw)
@@ -176,8 +150,7 @@ class ReportController extends Controller
             ->groupBy('lelong_id')
             ->get()->toArray();
 
-        foreach($lelongid as $laporan)
+        foreach ($lelongid as $laporan) {
-        {
             $details = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('lelong_id', $laporan['lelong_id'])
                 ->where('cawangan.caw_code', $kodcaw)
@@ -186,7 +159,6 @@ class ReportController extends Controller
             array_push($arrayinfo, ['laporan' => $laporan, 'details' => $details]);
         }
 
-
         foreach ($lelongs as $index1 => $lelong) {
 
             $marhun = LelongBidMarhun::where('lelongbid_id', '=', $lelong['id'])->get();
@@ -205,9 +177,6 @@ class ReportController extends Controller
             'hargaasas' => $hargaasas,
         ]);
 
-      
-
-          
         $pdf = PDF::loadView('pdf.listlelongdetails', compact('lelongs', 'arraycaw', 'total_nmarhun', 'total_berat', 'total_harga', 'total_hargaasas', 'arrayinfo'
         ))->setPaper('a4', 'potrait');
 
@@ -215,7 +184,8 @@ class ReportController extends Controller
 
     }
 
-    public function lapbidaanpembidaindex (){
+    public function lapbidaanpembidaindex()
+    {
 
         $arraydetails = [];
         $tarikhlelong_semasa = date('Y-m-d', strtotime(now()));
@@ -242,12 +212,11 @@ class ReportController extends Controller
 
         }
 
-
         return view('lelong.laporanbidaanindex', compact('lelongid', 'arraydetails'));
     }
 
-
+    public function senarailapbidaan($lelong_id, $kodcaw)
-    public function senarailapbidaan ($lelong_id, $kodcaw){
+    {
 
         $lel = Lelong::with('cawangan')->find($lelong_id);
         $datebida = $lel->tarikh_lelong;
@@ -268,8 +237,7 @@ class ReportController extends Controller
             ->groupBy('lelong_id')
             ->get();
 
-        foreach($lelongid as $laporancaw)
+        foreach ($lelongid as $laporancaw) {
-        {
             $cawangan = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('lelong_id', $laporancaw['lelong_id'])
                 ->where('cawangan.caw_code', $kodcaw)
@@ -278,7 +246,6 @@ class ReportController extends Controller
             array_push($arrayinfocaw, ['laporancaw' => $laporancaw, 'cawangan' => $cawangan]);
         }
 
-
         $laporanpembida = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
             ->select('lelongbid_id', 'norujukan', 'hargaasas', 't_lelong')
             ->where('masa_bidaan', 'LIKE', '%'.$datebida.'%')
@@ -294,8 +261,7 @@ class ReportController extends Controller
             // $total_hargabida = $total_hargabida + $totlappembida['hargabida'];
 
         }
-        foreach($laporanpembida as $laporan)
+        foreach ($laporanpembida as $laporan) {
-        {
             $details = LelongBidder::where('lelongbid_id', $laporan['lelongbid_id'])
                 ->where('masa_bidaan', 'LIKE', '%'.$datebida.'%')
                 ->orderBy('hargabida', 'desc')
@@ -305,9 +271,6 @@ class ReportController extends Controller
             array_push($arraydetails, ['laporan' => $laporan, 'details' => $details]);
         }
 
-   
-
-
         // $pdf = PDF::loadView('pdf.pdfsenarailapbidaan', compact('lelongid','arraydetails','lelong_id','lelongid','cawangan','arrayinfocaw','total_hargaasas','total_hargabida'))
         // ->setPaper('a4', 'potrait');
 
@@ -315,12 +278,10 @@ class ReportController extends Controller
 
         return view('lelong.senarailapbidaanpembida', compact('cawanganDetail', 'kodcaw', 'lelongid', 'arraydetails', 'lelong_id', 'lelongid', 'cawangan', 'arrayinfocaw', 'total_hargaasas', 'total_hargabida'));
 
-
-        
-        
     }
 
-    public function senarailapbidaanpdf ($lelong_id, $kodcaw){
+    public function senarailapbidaanpdf($lelong_id, $kodcaw)
+    {
 
         $lel = Lelong::with('cawangan')->find($lelong_id);
         $datebida = $lel->tarikh_lelong;
@@ -338,8 +299,7 @@ class ReportController extends Controller
             ->groupBy('lelong_id')
             ->get();
 
-        foreach($lelongid as $laporancaw)
+        foreach ($lelongid as $laporancaw) {
-        {
             $cawangan = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('lelong_id', $laporancaw['lelong_id'])
                 ->where('cawangan.caw_code', $kodcaw)
@@ -348,7 +308,6 @@ class ReportController extends Controller
             array_push($arrayinfocaw, ['laporancaw' => $laporancaw, 'cawangan' => $cawangan]);
         }
 
-
         $laporanpembida = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
             ->select('lelongbid_id', 'norujukan', 'hargaasas')
             ->where('masa_bidaan', 'LIKE', '%'.$datebida.'%')
@@ -364,8 +323,7 @@ class ReportController extends Controller
             // $total_hargabida = $total_hargabida + $totlappembida['hargabida'];
 
         }
-        foreach($laporanpembida as $laporan)
+        foreach ($laporanpembida as $laporan) {
-        {
             $details = LelongBidder::where('lelongbid_id', $laporan['lelongbid_id'])
                 ->where('masa_bidaan', 'LIKE', '%'.$datebida.'%')
                 ->orderBy('hargabida', 'desc')
@@ -375,20 +333,15 @@ class ReportController extends Controller
             array_push($arraydetails, ['laporan' => $laporan, 'details' => $details]);
         }
 
-   
-
-
         $pdf = PDF::loadView('pdf.pdfsenarailapbidaan', compact('lelongid', 'arraydetails', 'lelong_id', 'lelongid', 'cawangan', 'arrayinfocaw', 'total_hargaasas', 'total_hargabida'))
             ->setPaper('a4', 'potrait');
 
         return $pdf->download('Senarai Nama Bidaan Pembida.pdf');
 
-        
-        
     }
 
-
+    public function laplelongindex()
-    Public function laplelongindex (){
+    {
 
         $arraydetails = [];
 
@@ -414,10 +367,10 @@ class ReportController extends Controller
 
         return view('lelong.laplelongindex', compact('lelongid', 'arraydetails'));
 
-
     }
 
-    Public function laplelong ($lelong_id, $kodcaw){
+    public function laplelong($lelong_id, $kodcaw)
+    {
 
         $total_nmarhun = 0;
         $total_pembiayaan = 0;
@@ -437,7 +390,6 @@ class ReportController extends Controller
         $total_bakilelong = 0;
         $total_berat = 0;
 
-
         $info = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
             ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
             ->where('cawangan.caw_code', $kodcaw)
@@ -446,8 +398,7 @@ class ReportController extends Controller
             ->groupBy('lelong_id')
             ->get();
 
-        foreach($info as $laporancaw)
+        foreach ($info as $laporancaw) {
-        {
             $cawangan = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('cawangan.caw_code', $kodcaw)
                 ->where('lelong_id', $laporancaw['lelong_id'])
@@ -464,8 +415,7 @@ class ReportController extends Controller
                 'lelongbid.cajlelong', 'lelongbidder.hargabida', 'lelongbid.baki', 'lelongbid.hargaasas', 'lelongbidder.nama_bidder', 'lelongbid.tagujrah', 'lelongbid.ujrah', 'lelongbid.onepercent')
             ->get()->toArray();
 
-        foreach($laporanlelong as $index1=>$laplelong)
+        foreach ($laporanlelong as $index1 => $laplelong) {
-        {
 
             $margin = ($laplelong['pinjaman'] / $laplelong['nilaimarhun']) * 100;
 
@@ -473,12 +423,9 @@ class ReportController extends Controller
             $sumcajlelong = $laplelong['hargaasas'] * ($lelong[0]['cajlelong'] / 100);
             $totalbaki = $laplelong['hargaasas'] - $laplelong['pinjaman'] - $laplelong['bakiupah'] - bcdiv($sumcajlelong, 1, 1);
 
-            if($laplelong['baki'] > 0)
+            if ($laplelong['baki'] > 0) {
-            {
                 $bakilelong = $bakilelong + $laplelong['baki'];
-            }
+            } else {
-            else
-            {
                 $rugilelong = $rugilelong + $laplelong['baki'];
             }
 
@@ -487,8 +434,6 @@ class ReportController extends Controller
             //     $rugilelong = $rugilelong + $laplelong['baki'];
             // }
 
-
-
             $total_berat = $total_berat + $laplelong['berat'];
             $total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun'];
             $total_pembiayaan = $total_pembiayaan + $laplelong['pinjaman'];
@@ -505,30 +450,24 @@ class ReportController extends Controller
                 'rugilelong' => $rugilelong,
                 'bakilelong' => $bakilelong,
 
-                                    
             ]);
 
             $total_rugilelong = $total_rugilelong + $rugilelong;
             $total_bakilelong = $total_bakilelong + $bakilelong;
 
-                                   
         }
 
-
-
-
         $pdf = PDF::loadView('pdf.pdflaplelong', compact('info', 'lelong_id', 'laporanlelong', 'lelong_id', 'total_nmarhun', 'total_pembiayaan',
             'total_upahsimpan', 'total_cajlelong', 'total_hargalelong', 'total_bakirugi', 'total_hargaasas', 'arrayinfocaw', 'margin', 'arraydetails',
             'total_rugilelong', 'total_bakilelong', 'bakilelong', 'rugilelong', 'total_berat', 'total_onepercent', 'total_ujrah'))
-
             ->setPaper('a4', 'landscape');
-        return $pdf->download('Laporan Lelong Keseluruhan.pdf');
 
+        return $pdf->download('Laporan Lelong Keseluruhan.pdf');
 
     }
 
-
+    public function lapbrglelpembidaindex()
-    Public function lapbrglelpembidaindex (){
+    {
 
         $arraydetails = [];
 
@@ -554,14 +493,14 @@ class ReportController extends Controller
 
     }
 
-    Public function lapbrglelpembida ($lelong_id, $kodcaw){
+    public function lapbrglelpembida($lelong_id, $kodcaw)
+    {
 
         $total_berat = 0;
         $total_hargaasas = 0;
         $total_hargalelong = 0;
         $arrayinfocaw = [];
 
-
         $info = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
             ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
             ->where('cawangan.caw_code', $kodcaw)
@@ -570,8 +509,7 @@ class ReportController extends Controller
             ->groupBy('lelong_id')
             ->get();
 
-        foreach($info as $laporancaw)
+        foreach ($info as $laporancaw) {
-        {
             $cawangan = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('cawangan.caw_code', $kodcaw)
                 ->where('lelong_id', $laporancaw['lelong_id'])
@@ -580,8 +518,6 @@ class ReportController extends Controller
             array_push($arrayinfocaw, ['laporancaw' => $laporancaw, 'cawangan' => $cawangan]);
         }
 
- 
-
         $brglelpembida = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
             ->where('lelongbid.kodcaw', $kodcaw)
             ->where('lelongbid.lelong_id', '=', $lelong_id)
@@ -596,15 +532,14 @@ class ReportController extends Controller
 
         }
 
-
         $pdf = PDF::loadView('pdf.pdflapbrglelpembida', compact('lelong_id', 'info', 'brglelpembida', 'total_berat', 'total_hargaasas', 'total_hargalelong', 'arrayinfocaw'))
             ->setPaper('a4', 'potrait');
 
         return $pdf->download('Laporan Barang Lelong Pembida.pdf');
     }
 
-
+    public function lelongtebusindex()
-     Public function lelongtebusindex (){
+    {
 
         $arraydetails = [];
 
@@ -628,20 +563,18 @@ class ReportController extends Controller
             array_push($arraydetails, ['laporan' => $laporan, 'details' => $details]);
         }
 
-
         return view('lelong.lelongtebusindex', compact('lelongid', 'arraydetails'));
 
     }
 
-
+    public function lelongtebus($lelong_id, $kodcaw)
-    Public function lelongtebus ($lelong_id, $kodcaw){
+    {
 
         $total_nmarhun = 0;
         $total_pinjaman = 0;
         $total_upah = 0;
         $arrayinfocaw = [];
 
-
         $info = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
             ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
             ->where('cawangan.caw_code', $kodcaw)
@@ -650,8 +583,7 @@ class ReportController extends Controller
             ->groupBy('lelong_id')
             ->get();
 
-        foreach($info as $laporancaw)
+        foreach ($info as $laporancaw) {
-        {
             $cawangan = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('cawangan.caw_code', $kodcaw)
                 ->where('lelong_id', $laporancaw['lelong_id'])
@@ -661,7 +593,6 @@ class ReportController extends Controller
         }
         // dd($arrayinfocaw);
 
-
         $laporantebus = LelongTebus::where('kodcaw', $kodcaw)
             ->where('batch_no', $laporancaw['lelong_id'])
             ->get()->toArray();
@@ -674,15 +605,14 @@ class ReportController extends Controller
             $total_upah += $totalbrglelpembida['upah'];
         }
 
-
         $pdf = PDF::loadView('pdf.pdflelongtebus', compact('lelong_id', 'info', 'laporantebus', 'total_nmarhun', 'total_pinjaman', 'total_upah', 'arrayinfocaw'))
             ->setPaper('a4', 'potrait');
 
         return $pdf->download('Laporan Barang Lelong Pembida.pdf');
     }
 
-
+    public function simulasireport($simulasi_id, $cawid)
-     Public function simulasireport ($simulasi_id, $cawid){
+    {
 
         $keuntungan = 0;
         $total_berat = 0;
@@ -749,8 +679,6 @@ class ReportController extends Controller
             $marhuns[$index1]['keuntungan'] = $keuntungan;
             $marhuns[$index1]['nama'] = $customer;
 
-                
-
             array_push($arraymarhun, [
                 'norujukan' => $cal['norujukan'],
                 'tempoh' => $gadai['tempoh'],
@@ -764,12 +692,9 @@ class ReportController extends Controller
                 'baki' => $baki,
             ]);
 
-                if($cal['baki'] > 0)
+            if ($cal['baki'] > 0) {
-                {
                 $total_bakilelong = $total_bakilelong + $cal['baki'];
-                }
+            } else {
-                else
-                {
                 $total_rugilelong = $total_rugilelong - $cal['baki'];
             }
 
@@ -814,8 +739,7 @@ class ReportController extends Controller
         // dd($datagadai);
         $arraysag = [];
 
-         foreach($marhuns as $index1=>$cal)
+        foreach ($marhuns as $index1 => $cal) {
-         {
             $customer = Customer::where('kpbaru', '=', $cal['nokp'])
                 ->orWhere('kplama', '=', $cal['nokp'])
                 ->first();
@@ -844,11 +768,14 @@ class ReportController extends Controller
         $pdf = PDF::loadView('pdf.simulasireportbycust', compact('simulasilel', 'cawanganDetail', 'marhuns', 'simulasi_id', 'cawid', 'ktlhbyr', 'cawname'))
             ->setPaper('a4', 'potrait');
 
+        $pdf->setPaper('a4', 'landscape');
+
         return $pdf->download('Laporan Simulasi Cawangan by Pelanggan.pdf');
 
     }
 
-     public function lelongreport ($lelongid, $cawid){
+    public function lelongreport($lelongid, $cawid)
+    {
         $total_berat = 0;
         $total_pinjaman = 0;
         $total_upah = 0;
@@ -905,7 +832,6 @@ class ReportController extends Controller
             $marhuns[$index1]['cajlelong'] = $cajlelongnew;
             $marhuns[$index1]['baki'] = $totalbaki;
 
-
             // $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) );
             $marhuns[$index1]['keuntungan'] = $keuntungan;
             $marhuns[$index1]['nama'] = $customer;
@@ -946,9 +872,7 @@ class ReportController extends Controller
             ->groupBy('lelong_id')
             ->get()->toArray();
 
-
+        foreach ($lelong_id as $laporan) {
-        foreach($lelong_id as $laporan)
-        {
             $details = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('lelong_id', $laporan['lelong_id'])
                 ->where('caw_id', $cawid)
@@ -975,7 +899,8 @@ class ReportController extends Controller
         // return view('lelong.senaraimarhun',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo'));
     }
 
-    public function lapubahmarhunlelong (){
+    public function lapubahmarhunlelong()
+    {
 
         $arraydetails = [];
 
@@ -988,9 +913,7 @@ class ReportController extends Controller
             ->toArray();
         // dd($laporan);
 
-
+        foreach ($laporan as $brg) {
-        foreach($laporan as $brg)
-        {
             $details = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('lelong_id', $brg['lelong_id'])
                 ->distinct()
@@ -1000,12 +923,10 @@ class ReportController extends Controller
             array_push($arraydetails, ['brg' => $brg, 'detailsbrg' => $details]);
         }
 
-
         return view('marhun.ubahmarhuncaw', compact('arraydetails'));
 
     }
 
-
     public function lapubahmarhunlelongindex($lelong_id, $kodcaw)
     {
         $cawangan = Pengesahan::join('lelongbid', 'lelongbid.norujukan', '=', 'pengesahan.norujukan')
@@ -1054,10 +975,8 @@ class ReportController extends Controller
         return view('marhun.ubahmarhun', compact('cawangan', 'lelong_id', 'getpengesahan'));
     }
 
-   
+    public function exportubahmarhun()
-   
+    {
-
-    public function exportubahmarhun (){
 
         $arraydetails = [];
 
@@ -1069,8 +988,7 @@ class ReportController extends Controller
             ->get()
             ->toArray();
 
-         foreach($laporan as $lap) //stop here 01.09.2022
+        foreach ($laporan as $lap) { // stop here 01.09.2022
-         {
             $details = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                    ->where('lelong_id', $lap['lelong_id'])
                    ->where('caw_id', $lap['caw_id'])
@@ -1088,7 +1006,8 @@ class ReportController extends Controller
         return $pdf->download('Senarai Perubahan Marhun.pdf');
     }
 
-    public function lelongreportpc ($lelongid, $cawid){
+    public function lelongreportpc($lelongid, $cawid)
+    {
         $total_berat = 0;
         $total_pinjaman = 0;
         $total_upah = 0;
@@ -1154,7 +1073,7 @@ class ReportController extends Controller
                 'bakiupah' => $cal['bakiupah'],
                 'cajlelong' => $cal['cajlelong'],
                 'baki' => $cal['baki'],
-                'upah6bulan' => $gadai['bakiupah']
+                'upah6bulan' => $gadai['bakiupah'],
             ]);
             $total_berat = $total_berat + $cal['berat'];
             $total_pinjaman = $total_pinjaman + $cal['pinjaman'];
@@ -1173,9 +1092,7 @@ class ReportController extends Controller
             ->groupBy('lelong_id')
             ->get()->toArray();
 
-
+        foreach ($lelong_id as $laporan) {
-        foreach($lelong_id as $laporan)
-        {
             $details = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('lelong_id', $laporan['lelong_id'])
                 ->where('caw_id', $cawid)
@@ -1186,7 +1103,6 @@ class ReportController extends Controller
         $datacaw = Cawangan::where('id', '=', $cawid)
             ->get();
 
-        
         $pdf = PDF::loadView('pdf.pdflelongreportpc', compact('datacaw', 'arraymarhun', 'marhuns', 'lelongid', 'cawid', 'arrayinfo', 'total_berat',
             'total_pinjaman',
             'total_upah',
@@ -1201,18 +1117,19 @@ class ReportController extends Controller
         // return view('lelong.senaraimarhun',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo'));
     }
 
-
+    public function bdbrglelong()
-    public function bdbrglelong (){
+    {
 
         $caw = Cawangan::all();
 
         return view('laporan.bdbrglelong', compact('caw'));
     }
 
-    public function cetakbdbrglelong (Request $request){
+    public function cetakbdbrglelong(Request $request)
+    {
 
         $current = Carbon::now();
-        $current = new Carbon();
+        $current = new Carbon;
         $tarikh_cetak = $current->toDateString();
         $arraydetails = [];
         $total_berat = 0;
@@ -1271,7 +1188,8 @@ class ReportController extends Controller
         return view('pdf.cetakbdbrglelong', compact('cawangan', 'total_berat', 'total_hargaasas', 'namacaw', 't_mula', 't_hingga'));
     }
 
-    public function lapubahmarhunlelongindexpdf ($lelong_id, $kodcaw, $t_lelong){
+    public function lapubahmarhunlelongindexpdf($lelong_id, $kodcaw, $t_lelong)
+    {
 
         $cawangan = Pengesahan::join('lelongbid', 'lelongbid.norujukan', '=', 'pengesahan.norujukan')
             ->where('pengesahan.lelong_id', $lelong_id)
@@ -1291,9 +1209,7 @@ class ReportController extends Controller
             ->distinct()
             ->get();
 
-
+        foreach ($cawangan as $index1 => $caw) {
-        foreach($cawangan as $index1=>$caw)
-        {
 
             $getpengesahan = Cawangan::where('caw_code', $kodcaw)->first();
 
@@ -1305,7 +1221,6 @@ class ReportController extends Controller
                 ->orderBy('pengesahan.lelongbidmarhun_id', 'asc')
                 ->get();
 
-          
             $marhuns = LelongBidMarhun::join('pengesahan', 'pengesahan.lelongbidmarhun_id', '=', 'lelongbidmarhun.id')
                 ->where('pengesahan.lelongbid_id', $caw['lelongbid_id'])
                 ->orderBy('pengesahan.lelongbidmarhun_id', 'asc')
@@ -1320,7 +1235,6 @@ class ReportController extends Controller
 
         $getpengesahan = Cawangan::where('caw_code', $kodcaw)->first();
 
-
         //    return view('pdf.laporanubahmarhun', compact('cawangan','lelong_id','getpengesahan','t_lelong'));
 
         $pdf = PDF::loadView('pdf.laporanubahmarhun', compact('cawangan', 'lelong_id', 'getpengesahan', 't_lelong'))
@@ -1346,11 +1260,11 @@ class ReportController extends Controller
 
         $lel_karat_all = $request->lel_karat;
 
-        if ($request->search_type == "custom-search") {
+        if ($request->search_type == 'custom-search') {
             if ($request->jbg == 12) {
-                $raw_queries = "(jbg >= " . $request->jbg . " ) ";
+                $raw_queries = '(jbg >= '.$request->jbg.' ) ';
             } else {
-                $raw_queries = "(jbg = " . $request->jbg . " or jbg = " . ($request->jbg + 0.5) . ") ";
+                $raw_queries = '(jbg = '.$request->jbg.' or jbg = '.($request->jbg + 0.5).') ';
             }
             // if ($request->pinjaman == 1000.00) {
             //     $raw_queries = $raw_queries . "and pinjaman <= " . $request->pinjaman;
@@ -1359,27 +1273,27 @@ class ReportController extends Controller
             // } else {
             //     $raw_queries = $raw_queries . "and pinjaman between " . $request->pinjaman . " and " . ($request->pinjaman + 1000 - 0.01);
             // }
-        } else if ($request->search_type == "nokp-search") {
+        } elseif ($request->search_type == 'nokp-search') {
             $raw_queries = "nokp = '".$request->nokp."'";
-        } else if ($request->search_type == "norujukan-search") {
+        } elseif ($request->search_type == 'norujukan-search') {
             $raw_queries = "norujukan = '".$request->norujukan."'";
         }
 
         $gadai_all = Gadai::on($request->kodcaw)
             ->with('gadaiMarhun:norujukan,karat,berat,marhun')
             ->whereRaw($raw_queries)
-            ->where('sttebus', "")
+            ->where('sttebus', '')
             ->where('tagpalsu', 0)
             ->where('tagpalsu2', 0)
             ->orderBy('t_gadai', 'DESC')
             ->select('nokp', 'norujukan', 'percentpinj', 'tempoh', 'pinjaman', 'kadarupah', 'bakipjm', 'tempohbayar', 'berat')
             ->get();
 
-
         if ($gadai_all->isNotEmpty()) {
 
             $gadai_all = $gadai_all->map(function ($item) {
                 $item->keuntungan_semasa = number_format(0.00, 2, '.', ',');
+
                 return $item;
             });
 
@@ -1521,17 +1435,18 @@ class ReportController extends Controller
                 array_push($array_gadai, $gadai);
             }
 
-            if (sizeof($array_gadai) != 0) {
+            if (count($array_gadai) != 0) {
-                return response()->json(["success" => true, "array_gadai" => $array_gadai]);
+                return response()->json(['success' => true, 'array_gadai' => $array_gadai]);
             } else {
-                return response()->json(["success" => false, "array_gadai" => $array_gadai]);
+                return response()->json(['success' => false, 'array_gadai' => $array_gadai]);
             }
         } else {
-            return response()->json(["success" => false, "array_gadai" => $gadai_all]);
+            return response()->json(['success' => false, 'array_gadai' => $gadai_all]);
         }
     }
 
-    public function senarailapbidaanresult($lelong_id, $kodcaw){
+    public function senarailapbidaanresult($lelong_id, $kodcaw)
+    {
 
         $lel = Lelong::with('cawangan')->find($lelong_id);
         $datebida = $lel->tarikh_lelong;
@@ -1552,8 +1467,7 @@ class ReportController extends Controller
             ->groupBy('lelong_id')
             ->get();
 
-        foreach($lelongid as $laporancaw)
+        foreach ($lelongid as $laporancaw) {
-        {
             $cawangan = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('lelong_id', $laporancaw['lelong_id'])
                 ->where('cawangan.caw_code', $kodcaw)
@@ -1562,7 +1476,6 @@ class ReportController extends Controller
             array_push($arrayinfocaw, ['laporancaw' => $laporancaw, 'cawangan' => $cawangan]);
         }
 
-
         $laporanpembida = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
             ->select('lelongbid_id', 'norujukan', 'hargaasas', 't_lelong')
             ->where('masa_bidaan', 'LIKE', '%'.$datebida.'%')
@@ -1587,8 +1500,7 @@ class ReportController extends Controller
             // $total_hargabida = $total_hargabida + $totlappembida['hargabida'];
 
         }
-        foreach($laporanpembida as $laporan)
+        foreach ($laporanpembida as $laporan) {
-        {
             $details = LelongBidder::where('lelongbid_id', $laporan['lelongbid_id'])
                 ->where('masa_bidaan', 'LIKE', '%'.$datebida.'%')
                 ->orderBy('hargabida', 'desc')
@@ -1598,6 +1510,7 @@ class ReportController extends Controller
             // dd($details);
             array_push($arraydetails, ['laporan' => $laporan, 'details' => $details]);
         }
+
         return view('lelong.senarailapbidaanpembidaresult', compact('bil_bid', 'bil_xbid', 'cawanganDetail', 'kodcaw', 'lelongid', 'arraydetails', 'lelong_id', 'lelongid', 'cawangan', 'arrayinfocaw', 'total_hargaasas', 'total_hargabida'));
     }
 
@@ -1629,4 +1542,3 @@ class ReportController extends Controller
             ->with('success', 'Kemaskini Bidaan Berjaya');
     }
 }
-       

app/Http/Controllers/SerahanController.php

@@ -1,31 +1,20 @@
 <?php
 
-
-
 namespace App\Http\Controllers;
-use Illuminate\Support\Facades\Http;
 
-
-use Illuminate\Http\Request;
-use Spatie\Permission\Models\Role;
-use Spatie\Permission\Models\Permission;
-use Illuminate\Support\Facades\Auth;
-use Carbon\Carbon;
-use App\Models\User;
-use PDF;
 use App\Models\Cawangan;
-use App\Models\LelongBidder;
-use App\Models\Lelong;
 use App\Models\CawanganLelong;
+use App\Models\Invoice;
+use App\Models\Lelong;
 use App\Models\LelongBid;
+use App\Models\LelongBidder;
+use App\Models\LelongBidMarhun;
 use App\Models\Payment;
 use App\Models\Resit;
-use App\Models\Invoice;
+use App\Models\User;
-use App\Models\FileResit;
+use Illuminate\Support\Facades\Auth;
-use App\Models\LelongBidMarhun;
+use Illuminate\Support\Facades\Http;
-
+use PDF;
-
-
 
 class SerahanController extends Controller
 {
@@ -44,20 +33,15 @@ class SerahanController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-   
     public function laporanserahan()
     {
         // $user =  Auth::user();
 
- 
-        
         // $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
         // ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
         // ->where('cawangan.caw_code','=',$user->kodcaw)
         // ->get();
 
-
-
         // return view('serahan.laporanserahan',compact('lelongid'));
         $arrayinfo = [];
 
@@ -72,9 +56,7 @@ class SerahanController extends Controller
             ->get()
             ->toArray();
 
-
+        foreach ($lelong as $info) {
-        foreach($lelong as $info)
-        {
             $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('lelong_id', $info['lelong_id'])
                 ->where('cawangan.caw_code', $user->kodcaw)
@@ -88,7 +70,8 @@ class SerahanController extends Controller
 
     }
 
-    public function pembayaran($lelong_id){
+    public function pembayaran($lelong_id)
+    {
 
         $lelong_id = $lelong_id;
         $user = Auth::user();
@@ -113,7 +96,7 @@ class SerahanController extends Controller
 
             $payment[$index1]['details'] = $userdetails;
             $payment[$index1]['resit'] = $SAGWin[$index1]['resit_id'];
-            $payment[$index1]['total_surat'] = sizeof($SAGWin);
+            $payment[$index1]['total_surat'] = count($SAGWin);
             $payment[$index1]['totalBid'] = $SAGWin->sum('hargabida');
 
         }
@@ -123,9 +106,7 @@ class SerahanController extends Controller
 
     }
 
-
     public function penyatabayaran($user_id, $lelong_id)
-
     {
         $total_berat = 0;
         $user = Auth::user();
@@ -184,8 +165,8 @@ class SerahanController extends Controller
         return $pdf->download('Penyata Bayaran.pdf');
     }
 
-
+    public function resit($user_id, $lelong_id)
-    public function resit($user_id, $lelong_id){
+    {
 
         $user = Auth::user();
 
@@ -203,7 +184,6 @@ class SerahanController extends Controller
             )
             ->first();
 
-        
         $arraydetails = [];
 
         $brgdetails = LelongBidder::join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
@@ -222,8 +202,7 @@ class SerahanController extends Controller
         // dd($brgdetails);
 
         // dd($user->kodcaw);
-        foreach($brgdetails as $brg)
+        foreach ($brgdetails as $brg) {
-        {
             $details = Payment::join('lelongbid', 'payment.norujukan', '=', 'lelongbid.norujukan')
                 ->join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
                 ->join('users', 'lelongbidder.user_id', '=', 'users.id')
@@ -241,20 +220,15 @@ class SerahanController extends Controller
                 ->toArray();
             array_push($arraydetails, ['brg' => $brg, 'detailsbrg' => $details]);
 
-            
         }
         // dd($arraydetails);
 
-
-     
-
         return view('serahan.resit', compact('SAGBidItem', 'arraydetails', 'lelong_id', 'user_id', 'brgdetails'));
     }
 
     public function resitpembayaran($user_id, $resit_id, $lelong_id)
     {
 
-        
         $user = Auth::user();
 
         $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first()->toArray();
@@ -266,11 +240,9 @@ class SerahanController extends Controller
             ->first();
 
         $invois = Resit::where('id', $resit_id)
-
             ->get();
         // dd($invois);
 
-
         $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
             ->join('payment', 'lelongbid.norujukan', '=', 'payment.norujukan')
             ->join('resit', 'payment.resit_id', '=', 'resit.id')
@@ -296,7 +268,6 @@ class SerahanController extends Controller
         $caw['total_berat'] = $senaraisag->sum('berat');
         $caw['total_bidaan'] = $senaraisag->sum('hargabida');
 
-
         $pdf = PDF::loadView('pdf.resitpembayaran', compact('userdetails', 'SAGWin', 'caw', 'user', 'lelong', 'invois'))
             ->setPaper('a4', 'potrait');
 
@@ -326,11 +297,10 @@ class SerahanController extends Controller
         // dd($invois);
 
         $khazanah = Http::get(config('app.api_url_kaunter').'api/roles_harian/'.$user->kodcaw, [
-            'role_harian' => 'khazanah'
+            'role_harian' => 'khazanah',
         ])->json();
         // dd($roles_harian_khazanah);
 
-
         $SAGWin = LelongBid::join('scan_semak', 'lelongbid.norujukan', '=', 'scan_semak.norujukan')
             ->where('lelongbid.nopembeli', $user_id)
             ->where('lelongbid.status_payment', 1)
@@ -369,13 +339,11 @@ class SerahanController extends Controller
             $caw['total_berat'] = $senaraisag->sum('berat');
             $caw['total_bidaan'] = $senaraisag->sum('hargajual');
 
-
             $pdf = PDF::loadView('pdf.slipserahan', compact('userdetails', 'SAGWin', 'caw', 'user', 'lelong', 'invois', 'total_berat', 'khazanah'))
                 ->setPaper('a4', 'potrait');
 
             return $pdf->download('Slip Serahan.pdf');
-        }
+        } elseif ($SAGWin->isEmpty()) {
-        elseif($SAGWin->isEmpty()){
             return redirect()->route('pembayaran.kaunterpembayaran', $lelong_id)
                 ->with('failed', 'Maaf, Tidak Boleh Dijana kerana SAG Belum Di Scan Keluar/Belum Bayar Penuh');
         }
@@ -419,7 +387,4 @@ class SerahanController extends Controller
 
         return $pdf->download('Senarai Bidaan.pdf');
     }
-  
-    
 }
-       

app/Http/Controllers/SimulasiUjrahController.php

@@ -1,28 +1,28 @@
 <?php
 
 namespace App\Http\Controllers;
-use Carbon\Carbon;
+
 use App\Models\Cawangan;
-use App\Models\Tetapan;
-use App\Models\Gadai;
-use App\Models\Simulasi;
-use App\Models\JenisKarat;
-use App\Models\SimKarat;
-use App\Models\CawanganSimulasi;
-use App\Models\SimulasiBid;
-use App\Models\GadaiMarhun;
-use App\Models\SimulasiBidMarhun;
-use Illuminate\Support\Facades\Http;
 use App\Models\CawanganLelong;
-use Illuminate\Support\Facades\Auth;
+use App\Models\CawanganSimulasi;
+use App\Models\Customer;
+use App\Models\Gadai;
+use App\Models\GadaiMarhun;
+use App\Models\JenisKarat;
 use App\Models\LelongTebus;
 use App\Models\LogUser;
-use App\Models\TransaksiKeuntungan;
+use App\Models\SimKarat;
-use App\Models\Customer;
 use App\Models\SimKarat_temp;
-use Illuminate\Support\Facades\DB;
+use App\Models\Simulasi;
-
+use App\Models\SimulasiBid;
+use App\Models\SimulasiBidMarhun;
+use App\Models\Tetapan;
+use App\Models\TransaksiKeuntungan;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Http;
 use PDF;
 
 class SimulasiUjrahController extends Controller
@@ -42,17 +42,16 @@ class SimulasiUjrahController extends Controller
      *
      * @return \Illuminate\Contracts\Support\Renderable
      */
-
     public function index()
     {
         $currentDate = Carbon::now();
         $currentDate = $currentDate->toDateString();
         $caw = Cawangan::all();
         $tetapan = Tetapan::where('id', '=', 1)->first();
+
         return view('simulasiujrah.janasimulasi', compact('caw', 'tetapan', 'currentDate'));
     }
 
-
     public function senaraitempsimulasi(Request $request)
     {
         $t_lelong1 = date('d-m-Y', strtotime($request->tarikh_lelong));
@@ -66,8 +65,7 @@ class SimulasiUjrahController extends Controller
         $jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
         $t_lelongdisplay = $t_lelong->format('d-m-Y');
         $tetapan = Tetapan::where('id', '=', 1)->first();
-        if($t_lelong != null)
+        if ($t_lelong != null) {
-        {
 
             if ($request->fasa == '1') {
                 $cawangan_all = Cawangan::orderBy('caw_name')->get();
@@ -104,9 +102,7 @@ class SimulasiUjrahController extends Controller
                         array_push($senarai, $data);
                     }
                 }
-            }
+            } elseif ($request->fasa == '2') {
-
-            else if($request->fasa == '2'){
                 $cawangan_all = Cawangan::all();
                 $senarai = [];
                 $total_bil_lelong = 0;
@@ -143,14 +139,11 @@ class SimulasiUjrahController extends Controller
             }
             // dd($total_bil_lelong);
 
-            if($total_bil_lelong == 0)
+            if ($total_bil_lelong == 0) {
-            {
                 return redirect()->route('analisaujrah.janasimulasi')
                     ->with('failed', 'Tiada surat untuk di lelong');
             }
 
-
-           
             return view('simulasiujrah.senaraitempsimulasi', compact('t_lelong',
                 'getsurat',
                 'senarai',
@@ -163,11 +156,8 @@ class SimulasiUjrahController extends Controller
                 'cajlelong',
                 'tetapan'
 
-
             ));
-        }
+        } else {
-        else
-        {
             return redirect()->route('analisaujrah.janasimulasi')
                 ->with('failed', 'Sila Masukkan Tarikh Lelongan');
         }
@@ -182,8 +172,7 @@ class SimulasiUjrahController extends Controller
         $kali = $request->kali;
         $hargaasas = $request->hargaasas;  // rial
         $selected_caw = $request->caw;
-        if(!empty($selected_caw))
+        if (! empty($selected_caw)) {
-        {
             $jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
             $caws = Cawangan::whereIn('caw_code', $selected_caw)->get();
             // dd($caws);
@@ -202,8 +191,7 @@ class SimulasiUjrahController extends Controller
 
                     // ->count('norujukan');
 
-                }
+                } elseif ($fasa == '2') {
-                else if($fasa == '2'){
                     $surat = Gadai::on($caw->caw_code)
                         ->where('t_gadai', '<=', $jbgadai)
                         ->where('sttebus', '=', '')
@@ -218,8 +206,7 @@ class SimulasiUjrahController extends Controller
                 $bil_surat += $bil_sag_cawangan;
             }
 
-            if($bil_surat == 0)
+            if ($bil_surat == 0) {
-            {
                 return redirect()->route('analisaujrah.janasimulasi')
                     ->with('failed', 'Tiada surat untuk di lelong');
             }
@@ -233,20 +220,19 @@ class SimulasiUjrahController extends Controller
                 'fasa' => $fasa,
                 'kali' => $kali,
                 'success_import' => 1,
-                'tagujrah' => 1
+                'tagujrah' => 1,
             ]);
 
             // create harga asas berdasarkan input harga asas
             $karat = JenisKarat::all();
             $karat_data = [];
-            foreach($karat as $item)
+            foreach ($karat as $item) {
-            {
                 $data_karat = [
                     'simulasi_id' => $simulasi->id,
                     'karat' => $item->karat,
                     'keterangan' => $item->keterangan,
                     'harga' => ($hargaasas + ($item->dariharga916)),
-                    'harga2' => $hargaasas + ($item->dariharga916)
+                    'harga2' => $hargaasas + ($item->dariharga916),
                 ];
 
                 array_push($karat_data, $data_karat);
@@ -272,9 +258,8 @@ class SimulasiUjrahController extends Controller
 
                 $simulasi_bid_arr = [];
                 $now = Carbon::now();
-                foreach($suratcaw as $surat)
+                foreach ($suratcaw as $surat) {
-                {
+                    $simulasi_to_be_inserted = new SimulasiBid;
-                    $simulasi_to_be_inserted = new SimulasiBid();
                     $simulasi_to_be_inserted->simulasi_id = $simulasi->id;
                     $simulasi_to_be_inserted->caw_id = $cawsimulasi['cawangan']->id;
                     $simulasi_to_be_inserted->kodcaw = $surat->kodcaw;
@@ -307,11 +292,8 @@ class SimulasiUjrahController extends Controller
 
                 $gadaimarhun_to_update = $simulasi_bid_collection->pluck('norujukan');
 
-
                 $gadaimarhun = GadaiMarhun::on($cawsimulasi['cawangan']->caw_code)->whereIn('norujukan', $gadaimarhun_to_update)->get();
 
-
-
                 $simulasi_bid_ = SimulasiBid::whereIn('norujukan', $gadaimarhun_to_update)->get()->keyBy('norujukan');
 
                 $simulasi_bid_marhun_arr = [];
@@ -322,7 +304,7 @@ class SimulasiUjrahController extends Controller
 
                         $val = round($marhun->berat * $simkarattemp[$marhun->karat]->harga);
 
-                        $simmarhun = new SimulasiBidMarhun();
+                        $simmarhun = new SimulasiBidMarhun;
                         $simmarhun->simulasibid_id = $simulasi_bid_[$marhun->norujukan]->id;
                         $simmarhun->bil = $marhun->bil;
                         $simmarhun->marhun = $marhun->marhun;
@@ -343,16 +325,14 @@ class SimulasiUjrahController extends Controller
                     $updategadai = Http::withOptions(['verify' => config('app.api_verify')])
                         ->post(config('app.api_url').'taglel/update', [
                             'kodcaw' => $index['kodcaw'],
-                                        'norujukan'=>$index['norujukan']
+                            'norujukan' => $index['norujukan'],
                         ])
                         ->json();
                 }
 
             }
 
-        }
+        } else {
-        else
-        {
             return redirect()->route('analisaujrah.janasimulasi')->with('failed', 'Tiada surat untuk di lelong');
         }
 
@@ -360,6 +340,7 @@ class SimulasiUjrahController extends Controller
         // return redirect()->route('analisa.senaraisimulasi')->with('success',"Success daftar simulasi!");
 
     }
+
     public function senaraisimulasi()
     {
         $simulasiAll = Simulasi::with('cawangan')->where('tagujrah', 1)->orderBy('id', 'desc')->get();
@@ -381,8 +362,7 @@ class SimulasiUjrahController extends Controller
             ->select('simulasibid.caw_id')
             ->get();
         // dd($getcaw);
-        foreach($getcaw as $index=>$caw)
+        foreach ($getcaw as $index => $caw) {
-        {
             $cawid = $caw['caw_id'];
             $marhun = SimulasiBid::join('cawangan', 'simulasibid.caw_id', '=', 'cawangan.id')
                 ->where('simulasi_id', '=', $simulasi_id)
@@ -395,14 +375,12 @@ class SimulasiUjrahController extends Controller
             $senaraisag = Gadai::on($datasimulasi[$index]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
                 ->get();
             // dd($senaraisag);
-            foreach($senaraisag as $data)
+            foreach ($senaraisag as $data) {
-            {
                 // dd($data['norujukan']);
                 // dd($datasimulasi[$index]['fasa']);
                 if ($datasimulasi[$index]['fasa'] == 1) {
                     // insert lelong_tebus
-                    if($data['sttebus'] == "T")
+                    if ($data['sttebus'] == 'T') {
-                    {
                         $lelongtebus = new LelongTebus;
                         $lelongtebus->tarikh = $currentdate;
                         $lelongtebus->kodcaw = $data['kodcaw'];
@@ -419,7 +397,7 @@ class SimulasiUjrahController extends Controller
                         $updategadai = Http::withOptions(['verify' => config('app.api_verify')])
                             ->post(config('app.api_url').'taglel/revert', [
                                 'kodcaw' => $data['kodcaw'],
-                            'norujukan'=>$data['norujukan']
+                                'norujukan' => $data['norujukan'],
                             ])
                             ->json();
 
@@ -436,12 +414,9 @@ class SimulasiUjrahController extends Controller
                         $loguser->nota = ' LELONG TEBUS '.$simulasi_id;
                         $loguser->save();
 
-
+                    } elseif ($data['sttebus'] == '') {
-                    }
-                    else if($data['sttebus'] == ""){
                         $ktlhbyr = $data['hargajualan'] - $data['bakihargajualan'];
-                        if($ktlhbyr >= $data['bakiupah'])
+                        if ($ktlhbyr >= $data['bakiupah']) {
-                        {
                             $lelongtebus = new LelongTebus;
                             $lelongtebus->tarikh = $currentdate;
                             $lelongtebus->kodcaw = $data['kodcaw'];
@@ -458,7 +433,7 @@ class SimulasiUjrahController extends Controller
                             $updategadai = Http::withOptions(['verify' => config('app.api_verify')])
                                 ->post(config('app.api_url').'taglel/revert', [
                                     'kodcaw' => $data['kodcaw'],
-                                'norujukan'=>$data['norujukan']
+                                    'norujukan' => $data['norujukan'],
                                 ])
                                 ->json();
 
@@ -474,8 +449,7 @@ class SimulasiUjrahController extends Controller
                             $loguser->norujukan = $data['norujukan'];
                             $loguser->nota = ' KELUAR LELONG '.$simulasi_id;
                             $loguser->save();
-                        }
+                        } else {
-                        else{
                             // kemaskini keuntungan
                             $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan', '=', $data['norujukan'])->sum('keuntungan_rebet');
                             $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan', '=', $data['norujukan'])->sum('bayaran_keuntungan');
@@ -485,13 +459,11 @@ class SimulasiUjrahController extends Controller
                                 $keuntungan = 0.00;
                                 $rounded_ujrah = 0.00;
                                 $rounded_onepercent = 0.00;
-                            }
+                            } elseif ($data['tempoh'] == $data['tempohbayar']) {
-                            elseif($data['tempoh'] == $data['tempohbayar']){
                                 $keuntungan = 0.00;
                                 $rounded_ujrah = 0.00;
                                 $rounded_onepercent = 0.00;
-                            }
+                            } else {
-                            else{
                                 if ($data['tagbaru'] == '0') {
                                     // kemaskini keuntungan
                                     $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan', '=', $data['norujukan'])->sum('keuntungan_rebet');
@@ -568,8 +540,7 @@ class SimulasiUjrahController extends Controller
                     }
                 } elseif ($datasimulasi[$index]['fasa'] == 2) {
                     // dd($datasimulasi[$index]['fasa']);
-                    if($data['sttebus'] == "T")
+                    if ($data['sttebus'] == 'T') {
-                    {
                         $lelongtebus = new LelongTebus;
                         $lelongtebus->tarikh = $currentdate;
                         $lelongtebus->kodcaw = $data['kodcaw'];
@@ -586,7 +557,7 @@ class SimulasiUjrahController extends Controller
                         $updategadai = Http::withOptions(['verify' => config('app.api_verify')])
                             ->post(config('app.api_url').'taglel/revert', [
                                 'kodcaw' => $data['kodcaw'],
-                            'norujukan'=>$data['norujukan']
+                                'norujukan' => $data['norujukan'],
                             ])
                             ->json();
 
@@ -602,8 +573,7 @@ class SimulasiUjrahController extends Controller
                         $loguser->norujukan = $data['norujukan'];
                         $loguser->nota = ' LELONG TEBUS '.$simulasi_id;
                         $loguser->save();
-                    }
+                    } else {
-                    else{
                         if ($data['tagbaru'] == '1') {
                             // kiraan keuntungan ujrah
                             $jeniskeuntungan = 'onepercent';
@@ -679,10 +649,10 @@ class SimulasiUjrahController extends Controller
                     $simulasi->save();
                 }
 
-                   
             }
 
         }
+
         return redirect()->route('analisaujrah.senaraisimulasi')
             ->with('success', 'Kemaskini Berjaya');
     }
@@ -700,12 +670,11 @@ class SimulasiUjrahController extends Controller
         $cawanganAll = $simulasi->cawangan;
         $simBidGroupByCawId = $simulasi->simulasiBid->groupBy('caw_id');
 
-        foreach($cawanganAll as $caw_key_by_id)
+        foreach ($cawanganAll as $caw_key_by_id) {
-        {
             if ($simBidGroupByCawId[$caw_key_by_id['id']]);
-            {
+
             $caw_key_by_id['simulasiBid'] = $simBidGroupByCawId[$caw_key_by_id['id']];
-            }
+
         }
 
         $total24Kgb = 0;
@@ -753,42 +722,39 @@ class SimulasiUjrahController extends Controller
                 $onepercent += $sim_bid->onepercent;
                 $ujrah += $sim_bid->ujrah;
 
-
                 $sumcajlelong = $sim_bid['hargaasas'] * ($simulasi['cajlelong'] / 100);
                 $cajlelongnew = round($sumcajlelong, 1, 1);
                 // $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
                 $cajlelong = $cajlelong + $cajlelongnew;
                 $totalbaki = $sim_bid['hargaasas'] - $sim_bid['pinjaman'] - $sim_bid['bakiupah'] - $cajlelongnew;
-                if(strpos($totalbaki, '-') !== false)
+                if (strpos($totalbaki, '-') !== false) {
-                {
                     $rugi = -$totalbaki;
                     $rugilelong += $rugi;
-                }
+                } else {
-                else {
                     $baki = $totalbaki;
                     $bakilelong += $baki;
                 }
 
                 foreach ($sim_bid->simulasiBidMarhun as $sim_bid_marhun) {
-                    if ($sim_bid_marhun->karat == "24.0Kgb") {
+                    if ($sim_bid_marhun->karat == '24.0Kgb') {
                         $total24Kgb += $sim_bid_marhun->berat;
-                    } else if ($sim_bid_marhun->karat == "24.0K") {
+                    } elseif ($sim_bid_marhun->karat == '24.0K') {
                         $total24K += $sim_bid_marhun->berat;
-                    } else if ($sim_bid_marhun->karat == "23.0K") {
+                    } elseif ($sim_bid_marhun->karat == '23.0K') {
                         $total23k += $sim_bid_marhun->berat;
-                    } else if ($sim_bid_marhun->karat == "22.0K") {
+                    } elseif ($sim_bid_marhun->karat == '22.0K') {
                         $total22K += $sim_bid_marhun->berat;
-                    } else if ($sim_bid_marhun->karat == "21.0K") {
+                    } elseif ($sim_bid_marhun->karat == '21.0K') {
                         $total21K += $sim_bid_marhun->berat;
-                    } else if ($sim_bid_marhun->karat == "20.0K") {
+                    } elseif ($sim_bid_marhun->karat == '20.0K') {
                         $total20K += $sim_bid_marhun->berat;
-                    } else if ($sim_bid_marhun->karat == "18.0Kp") {
+                    } elseif ($sim_bid_marhun->karat == '18.0Kp') {
                         $total18Kp += $sim_bid_marhun->berat;
-                    } else if ($sim_bid_marhun->karat == "18.0K") {
+                    } elseif ($sim_bid_marhun->karat == '18.0K') {
                         $total18K += $sim_bid_marhun->berat;
-                    } else if ($sim_bid_marhun->karat == "14.0Kp") {
+                    } elseif ($sim_bid_marhun->karat == '14.0Kp') {
                         $total14Kp += $sim_bid_marhun->berat;
-                    } else if ($sim_bid_marhun->karat == "14.0K") {
+                    } elseif ($sim_bid_marhun->karat == '14.0K') {
                         $total14K += $sim_bid_marhun->berat;
                     }
                 }
@@ -861,17 +827,17 @@ class SimulasiUjrahController extends Controller
     public function delete($id)
     {
         $simulasibid = SimulasiBid::where('simulasi_id', '=', $id)->get();
-        foreach($simulasibid as $data)
+        foreach ($simulasibid as $data) {
-        {
             $updategadai = Http::withOptions(['verify' => config('app.api_verify')])
                 ->post(config('app.api_url').'taglel/revert', [
                     'kodcaw' => $data->kodcaw,
-                            'norujukan'=>$data->norujukan
+                    'norujukan' => $data->norujukan,
                 ])
                 ->json();
         }
         $role = Simulasi::where('id', '=', $id)->first();
         $role->delete();
+
         return redirect()->route('analisaujrah.senaraisimulasi')
             ->with('success', 'Padam Simulasi Berjaya');
     }
@@ -933,7 +899,6 @@ class SimulasiUjrahController extends Controller
             $total_onepercent += $cal['onepercent'];
             $total_ujrah += $cal['ujrah'];
 
-
             array_push($arraymarhun, [
                 'norujukan' => $cal['norujukan'],
                 'tempoh' => $cal['jbg'],
@@ -950,7 +915,6 @@ class SimulasiUjrahController extends Controller
             ]);
         }
 
-
         return view('simulasiujrah.senaraimarhunlel', compact('arraymarhun', 'marhuns', 'simulasi_id', 'cawid', 'keuntungan', 'total_berat',
             'total_nilaimarhun',
             'total_pinjaman',
@@ -984,8 +948,7 @@ class SimulasiUjrahController extends Controller
         // dd($datagadai);
         $arraysag = [];
 
-        foreach($marhuns as $index1=>$cal)
+        foreach ($marhuns as $index1 => $cal) {
-        {
             $customer = Customer::where('kpbaru', '=', $cal['nokp'])
                 ->orWhere('kplama', '=', $cal['nokp'])
                 ->first();
@@ -1014,11 +977,9 @@ class SimulasiUjrahController extends Controller
 
                 if ($listing['tempohbayar'] == 12) {
                     $keuntungan = 0.00;
-                }
+                } elseif ($listing['tempohbayar'] == $listing['tempoh']) {
-                elseif($listing['tempohbayar'] == $listing['tempoh'] ){
                     $keuntungan = 0.00;
-                }
+                } else {
-                else{
 
                     // kiraan keuntungan ujrah
                     $jeniskeuntungan = 'onepercent';
@@ -1037,6 +998,7 @@ class SimulasiUjrahController extends Controller
             $marhuns[$index1]['listsag'] = $listsag;
 
         }
+
         return view('simulasiujrah.listsagbycust', compact('simulasilel', 'cawanganDetail', 'marhuns', 'simulasi_id', 'cawid', 'ktlhbyr'));
     }
 
@@ -1072,7 +1034,7 @@ class SimulasiUjrahController extends Controller
             $cases .= sprintf(' WHEN id = %d THEN %s ', $sim_karat->id, $sim_karat->harga_baru);
         }
 
-        $build_query = sprintf("CASE %s END", $cases);
+        $build_query = sprintf('CASE %s END', $cases);
 
         SimKarat_temp::insert($simkarat_temp_arr);
 
@@ -1086,10 +1048,8 @@ class SimulasiUjrahController extends Controller
 
         /** -------------UPDATE SIMULASI BID MARHUN------------- */
         $list_simulasi_bid_marhun = collect();
-        foreach($simulasi_bid->keyBy('norujukan') as $index90 => $item)
+        foreach ($simulasi_bid->keyBy('norujukan') as $index90 => $item) {
-        {
+            foreach ($item->simulasiBidMarhun as $index55 => $lel_bid_marhun_collect) {
-            foreach($item->simulasiBidMarhun as $index55 => $lel_bid_marhun_collect)
-            {
                 $item->simulasiBidMarhun[$index55]['norujukan'] = $index90;
             }
             $list_simulasi_bid_marhun = $list_simulasi_bid_marhun->concat($item->simulasiBidMarhun);
@@ -1100,11 +1060,9 @@ class SimulasiUjrahController extends Controller
         $cases_update_hargaasas = '';
         $simulasi_bid_marhun_array = [];
 
-        foreach($list_simulasi_bid_marhun as $index => $marhun)
+        foreach ($list_simulasi_bid_marhun as $index => $marhun) {
-        {
             array_push($simulasi_bid_marhun_array, $marhun->id);
-            if ($new_sim_karat[$marhun->karat]) 
+            if ($new_sim_karat[$marhun->karat]) {
-            {
 
                 $harga_to_be_inserted = $new_sim_karat[$marhun->karat]->harga2;
                 $n_marhun_to_be_inserted = $marhun->berat * $new_sim_karat[$marhun->karat]->harga2;
@@ -1119,23 +1077,22 @@ class SimulasiUjrahController extends Controller
             }
 
         }
-        $build_query_update_harga = sprintf("CASE %s END", $cases_update_harga);
+        $build_query_update_harga = sprintf('CASE %s END', $cases_update_harga);
-        $build_query_update_n_marhun = sprintf("CASE %s END", $cases_update_n_marhun);
+        $build_query_update_n_marhun = sprintf('CASE %s END', $cases_update_n_marhun);
-        $build_query_update_hargaasas = sprintf("CASE %s END", $cases_update_hargaasas);
+        $build_query_update_hargaasas = sprintf('CASE %s END', $cases_update_hargaasas);
 
         SimulasiBidMarhun::query()->whereIn('id', $simulasi_bid_marhun_array)
             ->update([
                 'harga' => DB::raw($build_query_update_harga),
                 'n_marhun' => DB::raw($build_query_update_n_marhun),
-            'hargaasas' => DB::raw($build_query_update_hargaasas)
+                'hargaasas' => DB::raw($build_query_update_hargaasas),
             ]);
 
         /** -------------UPDATE SIMULASI BID------------- */
         $list_simulasi_bid_marhun_updated = $list_simulasi_bid_marhun->groupBy('simulasibid_id');
         $collection_simulasi_bid_marhun_updated = collect();
 
-        foreach($list_simulasi_bid_marhun_updated as $index2 => $simulasi_bid_updated)
+        foreach ($list_simulasi_bid_marhun_updated as $index2 => $simulasi_bid_updated) {
-        {
             $array_to_be_inserted = [];
             $array_to_be_inserted['id'] = $index2;
             $array_to_be_inserted['norujukan'] = $simulasi_bid_updated[0]->norujukan;
@@ -1148,15 +1105,14 @@ class SimulasiUjrahController extends Controller
         $cases_update_hargaasas_simulasi_bid = '';
         $log_user_array = [];
 
-        foreach($collection_simulasi_bid_marhun_updated as $collection_simulasi_bid)
+        foreach ($collection_simulasi_bid_marhun_updated as $collection_simulasi_bid) {
-        {
             $log_user_array_to_be_inserted = [
-                "user_id" => $user->id,
+                'user_id' => $user->id,
-                "date" => $currentNow->toDateTimeString(),
+                'date' => $currentNow->toDateTimeString(),
-                "username" => $user->username,
+                'username' => $user->username,
-                "nama_user" => $user->name,
+                'nama_user' => $user->name,
-                "norujukan" => $collection_simulasi_bid['norujukan'],
+                'norujukan' => $collection_simulasi_bid['norujukan'],
-                "nota" => "Simulasi, Kemaskini Harga Asas RM" . $collection_simulasi_bid['total_hargaasas'],
+                'nota' => 'Simulasi, Kemaskini Harga Asas RM'.$collection_simulasi_bid['total_hargaasas'],
                 'created_at' => $currentNow,
                 'updated_at' => $currentNow,
             ];
@@ -1166,7 +1122,7 @@ class SimulasiUjrahController extends Controller
         }
 
         // $build_query_update_nmarhuns_simulasi_bid = sprintf("CASE %s END", $cases_update_n_marhuns_simulasi_bid);
-        $build_query_update_hargaasas_simulasi_bid = sprintf("CASE %s END", $cases_update_hargaasas_simulasi_bid);
+        $build_query_update_hargaasas_simulasi_bid = sprintf('CASE %s END', $cases_update_hargaasas_simulasi_bid);
 
         SimulasiBid::query()->where('simulasi_id', $request->idsimulasi)
             ->update([
@@ -1241,19 +1197,16 @@ class SimulasiUjrahController extends Controller
         // $t_daftarlelong = ($tarikh_lelong->subMonths(1))->format('d/m/Y');
         // dd($getsurat);
 
-        foreach($getsurat as $index1=>$surats)
+        foreach ($getsurat as $index1 => $surats) {
-        {
             $senarai = Gadai::on($details)
                 ->where('norujukan', $surats['norujukan'])
                 ->get();
             // dd($surats['tempoh']);
 
-
             $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan', '=', $surats['norujukan'])->sum('keuntungan_rebet');
             $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan', '=', $surats['norujukan'])->sum('bayaran_keuntungan');
             $beza_keuntungan = $total_untung_asal - $total_untung_rebet;
 
-                
             // kiraan keuntungan ujrah
             $jeniskeuntungan = 'onepercent';
             // $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$details.'/'.$surats['norujukan'].'/'.$jeniskeuntungan)->json();
@@ -1271,7 +1224,6 @@ class SimulasiUjrahController extends Controller
             // dd($surats['norujukan']);
         }
 
-
         // $keuntungantlhbyr = TransaksiKeuntungan::on('mysql2')
         //                                         ->sum('bayaran_keuntungan');
 
@@ -1324,8 +1276,7 @@ class SimulasiUjrahController extends Controller
         $total_onepercent = 0;
         $total_ujrah = 0;
 
-        foreach($cawangansim as $cawsim)
+        foreach ($cawangansim as $cawsim) {
-        {
             $cawangan = Cawangan::where('id', '=', $cawsim->caw_id)->first();
             // $databid = SimulasiBid::join('gadai','simulasibid.norujukan','=','gadai.norujukan')
             // ->select('simulasibid.id','simulasibid.berat','simulasibid.marhun','simulasibid.cajlelong','simulasibid.baki','simulasibid.nilaimarhun',
@@ -1352,9 +1303,7 @@ class SimulasiUjrahController extends Controller
             // $keuntungan = 0;
             // $total_upahkeuntungan = 0;
 
-
+            foreach ($databid as $index1 => $bid) {
-            foreach($databid as $index1=>$bid)
-            {
                 $marhun = SimulasiBidMarhun::where('simulasibid_id', '=', $bid['id'])->get();
                 $berat = $berat + $bid['berat'];
                 // $nilai_marhun = $nilai_marhun + ($marhun->sum('n_marhun'));
@@ -1366,7 +1315,6 @@ class SimulasiUjrahController extends Controller
                 $hargaasas = $hargaasas + $bid['hargaasas'];
                 // $cajlelong = $cajlelong + $bid['cajlelong'];
 
-
                 // $keuntungan = $bid['bakipjm'] - ($bid['bakihargajualan'] - ($bid['upah12'] - $bid['ansakhir'])-(($bid['tempoh']-$bid['tempohbayar'])*$bid['kadarupah']/100*$bid['bakipjm']) );
                 // $databid[$index1]['keuntungan'] = $keuntungan;
 
@@ -1377,12 +1325,10 @@ class SimulasiUjrahController extends Controller
                 $cajlelongnew = round($sumcajlelong, 1, 1);
                 $cajlelong = $cajlelong + $cajlelongnew;
                 $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - $cajlelongnew;
-                if(strpos($totalbaki, '-') !== false)
+                if (strpos($totalbaki, '-') !== false) {
-                {
                     $rugi = -$totalbaki;
                     $rugilelong += $rugi;
-                }
+                } else {
-                else {
                     $baki = $totalbaki;
                     $bakilelong += $baki;
                 }
@@ -1431,15 +1377,13 @@ class SimulasiUjrahController extends Controller
                     ->where('karat', '=', '9.0K')
                     ->sum('berat');
 
-
-
             }
 
             array_push($arraycaw, [
                 'id_cawangan' => $cawangan['id'],
                 'cawangan' => $cawangan['caw_name'],
                 't_lelong' => $simulasi['tarikh_lelong'],
-                'bil_marhun'=>sizeof($databid),
+                'bil_marhun' => count($databid),
                 'berat' => $berat,
                 'n_marhun' => $nilai_marhun,
                 'pinjaman' => $pinjaman,
@@ -1453,8 +1397,7 @@ class SimulasiUjrahController extends Controller
                 'bakilelong' => $bakilelong,
             ]);
 
-
+            $total_marhun = $total_marhun + count($databid);
-            $total_marhun = $total_marhun + sizeof($databid);
             $total_berat = $total_berat + $berat;
             $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
             $total_pinjaman = $total_pinjaman + $pinjaman;
@@ -1466,16 +1409,11 @@ class SimulasiUjrahController extends Controller
             $total_onepercent = $total_onepercent + $onepercent;
             $total_ujrah = $total_ujrah + $ujrah;
 
-
             $data = Simulasi::where('simulasi.id', '=', $simulasi_id)
                 ->first();
 
-
         }
 
-
-
-
         $pdf = PDF::loadView('pdf.simrpt2ujrah', compact('arraycaw',
             'total_marhun',
             'total_berat',
@@ -1506,10 +1444,8 @@ class SimulasiUjrahController extends Controller
             'total_ujrah',
             'total_nilaimarhun'
         ))->setPaper('a4', 'landscape');
+
         return $pdf->download('Simulasi Keseluruhan.pdf');
 
-
     }
-
-
 }

app/Http/Controllers/TamatKontController.php

@@ -2,39 +2,23 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Support\Facades\Auth;
+use App\Models\Cawangan;
-use Illuminate\Http\Request;
+use App\Models\CawanganSimulasi;
-use Carbon\Carbon;
+use App\Models\Customer;
-use Spatie\Permission\Models\Role;
-use Spatie\Permission\Models\Permission;
-use Maatwebsite\Excel\Concerns\FromCollection;
-use Excel;
-
-
-
-use App\Models\User;
 use App\Models\Gadai;
 use App\Models\GadaiMarhun;
-use App\Models\Cawangan;
+use App\Models\JenisKarat;
-use App\Models\TransaksiKeuntungan;
+use App\Models\Lelong;
-use PDF;
+use App\Models\SimKarat;
 use App\Models\Simulasi;
 use App\Models\SimulasiBid;
 use App\Models\SimulasiBidMarhun;
-use App\Models\SimKarat;
+use App\Models\TransaksiKeuntungan;
-use App\Models\SimKarat_temp;
+use Carbon\Carbon;
-use App\Models\CawanganSimulasi;
+use Excel;
-use App\Models\JenisEmas;
+use Illuminate\Http\Request;
-use App\Models\JenisKarat;
+use Illuminate\Support\Facades\Auth;
-use App\Models\Lelong;
+use PDF;
-use App\Models\CawanganLelong;
-use App\Models\LelongBid;
-use App\Models\LelongBidMarhun;
-use App\Models\LelKarat;
-use App\Models\Customer;
-
-
-use DateTime;
 
 class TamatKontController extends Controller
 {
@@ -55,7 +39,6 @@ class TamatKontController extends Controller
         // ->get();
         // dd($cawangan);
 
-        
         $getsurat = Gadai::on($user->kodcaw)
             ->where('t_matang1', '<', $t_lelong)
             ->where('kodcaw', $user->kodcaw)
@@ -68,9 +51,7 @@ class TamatKontController extends Controller
 
         // dd($getsurat);
 
-
+        if (count($getsurat) != 0) {
-        if(sizeof($getsurat) != 0)
-        {
 
             $t_gadais = Gadai::on($user->kodcaw)
                 ->where('t_matang1', '<', $t_lelong)
@@ -106,8 +87,7 @@ class TamatKontController extends Controller
 
             // $t_anggaran = date('d-m-Y', strtotime('-1 months', strtotime($tarikh_lelong)));
 
-            foreach($getsurat as $index1=>$surats)
+            foreach ($getsurat as $index1 => $surats) {
-            {
                 $senarai = Gadai::on($user->kodcaw)
                 // join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
                     ->where('norujukan', $surats['norujukan'])
@@ -115,7 +95,6 @@ class TamatKontController extends Controller
 
                 $ktlhbyr = $surats['hargajualan'] - $surats['bakihargajualan'];
 
-                
                 $getsurat[$index1]['list_norujukan'] = $senarai;
                 $getsurat[$index1]['ktlhbyr'] = $ktlhbyr;
 
@@ -133,14 +112,10 @@ class TamatKontController extends Controller
                 'bil_lelongcaw',
                 'ktlhbyr'
             ));
-        }
+        } elseif (count($getsurat) == 0) {
-        else if(sizeof($getsurat) == 0)
-        {
             return redirect()->route('jananotis.notistamatkontrak')
                 ->with('failed', 'Tiada surat untuk di lelong');
-        }
+        } else {
-        else
-        {
             return redirect()->route('jananotis.notistamatkontrak')
                 ->with('failed', 'Sila Masukkan Tarikh Lelongan');
         }
@@ -165,7 +140,6 @@ class TamatKontController extends Controller
 
         // dd($getsurat);
 
-            
         $t_gadais = Gadai::on($user->kodcaw)
             ->where('t_matang1', '<', $t_lelong)
             ->where('sttebus', '=', '')
@@ -200,8 +174,7 @@ class TamatKontController extends Controller
 
         // $t_anggaran = date('d-m-Y', strtotime('-1 months', strtotime($tarikh_lelong)));
 
-            foreach($getsurat as $index1=>$surats)
+        foreach ($getsurat as $index1 => $surats) {
-            {
             $senarai = Gadai::on($user->kodcaw)
             // join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
                 ->where('norujukan', $surats['norujukan'])
@@ -209,7 +182,6 @@ class TamatKontController extends Controller
 
             $ktlhbyr = $surats['hargajualan'] - $surats['bakihargajualan'];
 
-                
             $getsurat[$index1]['list_norujukan'] = $senarai;
             $getsurat[$index1]['ktlhbyr'] = $ktlhbyr;
 
@@ -221,12 +193,10 @@ class TamatKontController extends Controller
             't_anggaran',
             'bil_lelongcaw',
             'ktlhbyr'))
-    
             ->setPaper('a4', 'potrait');
+
         return $pdf->download('Notis Sebelum Tamat Kontrak.pdf');
 
-        
-
     }
 
     public function gadaibycawexcel(Request $request, $t_lelong)
@@ -247,7 +217,6 @@ class TamatKontController extends Controller
 
         // dd($getsurat);
 
-            
         $t_gadais = Gadai::on($user->kodcaw)
             ->where('t_matang1', '<', $t_lelong)
             ->where('sttebus', '=', '')
@@ -282,8 +251,7 @@ class TamatKontController extends Controller
 
         // $t_anggaran = date('d-m-Y', strtotime('-1 months', strtotime($tarikh_lelong)));
 
-            foreach($getsurat as $index1=>$surats)
+        foreach ($getsurat as $index1 => $surats) {
-            {
 
             $customer = Customer::where('kpbaru', '=', $surats['nokp'])
                 ->orWhere('kplama', '=', $surats['nokp'])
@@ -295,7 +263,6 @@ class TamatKontController extends Controller
 
             $ktlhbyr = $surats['hargajualan'] - $surats['bakihargajualan'];
 
-
             // foreach($listsag as $index=>$listing){
 
             //     $bayaran = $listing['hargajualan'] - $listing['bakihargajualan'];
@@ -304,7 +271,6 @@ class TamatKontController extends Controller
 
             // $ktlhbyr = $surats['hargajualan']-$surats['bakihargajualan'];
 
-                
             $getsurat[$index1]['nama'] = $customer;
             $getsurat[$index1]['ktlhbyr'] = $ktlhbyr;
 
@@ -321,9 +287,6 @@ class TamatKontController extends Controller
             'ktlhbyr'
         ));
 
-            
-        
-
     }
 
     // Operasi
@@ -340,10 +303,7 @@ class TamatKontController extends Controller
         $t_anggaran = ($tarikh_lelong->subDays(20))->format('d/m/Y');
         $t_daftarlelong = ($tarikh_lelong->subMonths(1))->format('d/m/Y');
 
-       
+        if ($t_lelong != null) {
-        
-        if($t_lelong != null)
-        {
             $getsurat = Gadai::where('t_matang1', '<', $t_lelong)
                 ->where('sttebus', '=', '')
                 ->where('taglel', '=', 0)
@@ -352,8 +312,7 @@ class TamatKontController extends Controller
                 ->whereNotNull('upah12')
                 ->get();
             // dd($getsurat);
-            if(sizeof($getsurat) == 0)
+            if (count($getsurat) == 0) {
-            {
                 return redirect()->route('notistamatkontrak.sebelumtamatkont')
                     ->with('failed', 'Tiada surat untuk di lelong');
             }
@@ -391,7 +350,7 @@ class TamatKontController extends Controller
                                         cawangan.caw_name as caw_name')
                 ->get();
 
-            $bil_lelong = sizeof($getsurat);
+            $bil_lelong = count($getsurat);
 
             return view('jananotis.senaraitemp', compact('t_lelong',
                 'getsurat',
@@ -401,9 +360,7 @@ class TamatKontController extends Controller
                 't_daftarlelong',
                 't_lelongdisplay'
             ));
-        }
+        } else {
-        else
-        {
             return redirect()->route('notistamatkontrak.sebelumtamatkont')
                 ->with('failed', 'Sila Masukkan Tarikh Lelongan');
         }
@@ -437,9 +394,7 @@ class TamatKontController extends Controller
         $t_anggaran = ($tarikh_lelong->subDays(20))->format('d/m/Y');
         $t_daftarlelong = ($tarikh_lelong->subMonths(1))->format('d/m/Y');
 
-
+        foreach ($getsurat as $index1 => $surats) {
-        foreach($getsurat as $index1=>$surats)
-        {
             $senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
                 ->where('norujukan', $surats['norujukan'])
                 ->get();
@@ -461,6 +416,7 @@ class TamatKontController extends Controller
             't_lelongdisplay'
         ));
     }
+
     public function janadatatamatkontrak(Request $request)
     {
         // dd($request->all());
@@ -483,8 +439,7 @@ class TamatKontController extends Controller
         }
         // dd($surat);
         // dd($jbg);
-        if(sizeof($surat) == 0)
+        if (count($surat) == 0) {
-        {
             return redirect()->route('analisa.janasimulasi')
                 ->with('failed', 'Tiada surat untuk di lelong');
         }
@@ -492,7 +447,7 @@ class TamatKontController extends Controller
         // create simulasi
         $simulasi = new Simulasi;
         $simulasi->tarikh_lelong = $request->trkh_lelong;
-        $simulasi->harga_emas_asas = "0.00";
+        $simulasi->harga_emas_asas = '0.00';
         $simulasi->jbg = $jbg;
         $simulasi->cajlelong = $cajlelong;
         $simulasi->fasa = $fasa;
@@ -501,8 +456,7 @@ class TamatKontController extends Controller
         // create harga asas berdasarkan input harga asas
         $karat = JenisKarat::all();
         $hargaasas = $request->hargaasas;  // rial
-        foreach($karat as $item)
+        foreach ($karat as $item) {
-        {
             $simkarat = new SimKarat;
             $simkarat->simulasi_id = $simulasi->id;
             $simkarat->karat = $item->karat;
@@ -514,8 +468,7 @@ class TamatKontController extends Controller
 
         // $fasa = $request->fasa;
         // join cawangan yang terlibat dengan simulasi
-        if($request->caw && $request->caw != 'all')
+        if ($request->caw && $request->caw != 'all') {
-        {
             // dd($request->kodcaw);
             $caw = Cawangan::whereIn('caw_code', $request->caw)->get();
             // dd($caw);
@@ -533,8 +486,7 @@ class TamatKontController extends Controller
                 $suratcaw = $surat->where('kodcaw', '=', $cawsimulasi->caw_code)->all();
 
                 // $simulasibid = SimulasiBid::where('caw_id','=',$caw->id)->get();
-            foreach($suratcaw as $data)
+                foreach ($suratcaw as $data) {
-            {
                     $simulasibid = new SimulasiBid;
                     $simulasibid->simulasi_id = $simulasi->id;
                     $simulasibid->caw_id = $cawsimulasi->id;
@@ -564,15 +516,12 @@ class TamatKontController extends Controller
                     $sumhargaasas = 0;
                     $berat = 0;
                     $gadaimarhun = GadaiMarhun::where('norujukan', '=', $data->norujukan)->get();
-                foreach($gadaimarhun as $marhun)
+                    foreach ($gadaimarhun as $marhun) {
-                {
                         $simkarat = SimKarat::where('simulasi_id', '=', $simulasi->id)->get();
                         // dd($simkarat);
-                    foreach($simkarat as $karat)
+                        foreach ($simkarat as $karat) {
-                    {
 
-                        if($karat->karat == $marhun->karat)
+                            if ($karat->karat == $marhun->karat) {
-                        {
                                 $val = round($marhun->berat * $karat->harga);
                                 $sumhargaasas = $sumhargaasas + $val;
                                 $berat = $berat + $marhun->berat;
@@ -591,10 +540,8 @@ class TamatKontController extends Controller
                             }
                         }
 
-                    
                     }
 
-
                     $calcaj = ($request->cajlelong / 100) * $sumhargaasas;
                     $updatesimbid = SimulasiBid::where('id', '=', $simulasibid->id)->first();
                     $updatesimbid->hargaasas = $sumhargaasas;
@@ -604,9 +551,7 @@ class TamatKontController extends Controller
                     $updatesimbid->save();
                 }
             }
-        }
+        } else {
-        else
-        {
             dd('error');
         }
 

app/Http/Controllers/TangguhLelongController.php

@@ -2,25 +2,22 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Support\Facades\Http;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Carbon\Carbon;
-
-use App\Models\Gadai;
 use App\Models\Cawangan;
+use App\Models\CawanganLelong;
 use App\Models\Customer;
+use App\Models\Gadai;
+use App\Models\GadaiMarhun;
 use App\Models\Lelong;
 use App\Models\LelongBid;
 use App\Models\LelongBidMarhun;
-use App\Models\CawanganLelong;
-use App\Models\TangguhLelong;
-use App\Models\Pengesahan;
-use App\Models\GadaiMarhun;
 use App\Models\LogUser;
+use App\Models\Pengesahan;
+use App\Models\TangguhLelong;
+use Carbon\Carbon;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Http;
 use PDF;
-use DateTime;
-use PHPUnit\Framework\Constraint\Count;
 
 class TangguhLelongController extends Controller
 {
@@ -41,8 +38,7 @@ class TangguhLelongController extends Controller
             ->get()
             ->toArray();
 
-        foreach($lelong as $info)
+        foreach ($lelong as $info) {
-        {
 
             $detailsinfo = CawanganLelong::select('cawangan_lelong.caw_id', 'caw_name', 'lelongbid.status_jual', 'caw_code')
                 ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
@@ -72,7 +68,6 @@ class TangguhLelongController extends Controller
 
         $namacaw = Cawangan::where('caw_code', $user['kodcaw'])->first();
 
-
         $lelongbid = LelongBid::where('kodcaw', $user['kodcaw']);
 
         $arraylelongbid = $lelongbid->pluck('kodcaw')->toArray();
@@ -92,16 +87,11 @@ class TangguhLelongController extends Controller
         // ->first();
         // dd($checkkodcaw);
 
-        if($request->nokp == null)
+        if ($request->nokp == null) {
-        {
             return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed', 'Sila Masukkan No Kad Pengenalan');
-        }
+        } elseif ($checkkodcaw == null) {
-        else if($checkkodcaw == null)
-        {
             return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed', 'No Kad Pengenalan Tiada Dalam Rekod');
-        }
+        } elseif ($request->nokp != null) {
-        else if($request->nokp != null)
-        {
             $lelong = Lelong::where('id', $request->lelong_id)->first();
 
             $lelbid = LelongBid::where('kodcaw', $user['kodcaw'])
@@ -123,11 +113,9 @@ class TangguhLelongController extends Controller
 
             // if(empty($ic)) {
             //     return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Tiada Dalam Rekod Lelongan');
-            if($getic) 
+            if ($getic) {
-            {
 
-                foreach($getic as $index1=>$ic)
+                foreach ($getic as $index1 => $ic) {
-                {
 
                     $getnorujukan = LelongBid::where('norujukan', $ic['norujukan'])
                     // ->where('jbg', $ic['tempoh'])
@@ -136,7 +124,6 @@ class TangguhLelongController extends Controller
                         ->get();
                     //  dd($getnorujukan);
 
-                        
                     $customer = LelongBid::where('kodcaw', $user['kodcaw']);
 
                     $arraycustomer = $customer->pluck('kodcaw')->toArray();
@@ -151,9 +138,7 @@ class TangguhLelongController extends Controller
                         ->first();
                     // dd($customer_detail);
 
-                        
+                    foreach ($getnorujukan as $norujukan) {
-                        foreach($getnorujukan as $norujukan)
-                        {
 
                         $getic[$index1]['user_details'] = $getnorujukan;
                         $getic[$index1]['t_lelong'] = $lelong->tarikh_lelong;
@@ -165,6 +150,7 @@ class TangguhLelongController extends Controller
                     $lelong_id = $request->lelong_id;
 
                 } // end foreach
+
                 return view('tangguhlelong.searchtodownload', compact('getic', 'customer_detail', 'user', 'lelong_id', 'namacaw'));
             } else {
                 return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed', 'Tiada Dalam Rekod Lelongan');
@@ -183,20 +169,16 @@ class TangguhLelongController extends Controller
 
         $lelbidmarhun = $request->checkboxdata;
 
-        if($lelbidmarhun == null)
+        if ($lelbidmarhun == null) {
-        {
             return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed', 'Sila Klik Pada Kotak Semak');
-        }
+        } else {
-        else
-        {
             $lelbidmarhun = $request->checkboxdata;
 
             $lelong = Lelong::where('id', $request->lelong_id)->get()->toArray();
 
             $arraynorujukan = [];
 
-            foreach($lelbidmarhun as $bidmarhun)
+            foreach ($lelbidmarhun as $bidmarhun) {
-            {
                 // dd($bidmarhun);
                 $lelongbidmarhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
                     ->where('lelongbid.id', $bidmarhun)
@@ -242,7 +224,7 @@ class TangguhLelongController extends Controller
 
                 // $updatelelbid = LelongBid::where('id', $lelongbidmarhun[0]['id'])
 
-                $pengesahan = new Pengesahan();
+                $pengesahan = new Pengesahan;
                 $pengesahan->lelong_id = $request->lelong_id;
                 $pengesahan->lelongbid_id = $bidmarhun;
                 $pengesahan->lelongbidmarhun_id = $lelongbidmarhun[0]['lelongbidmarhun_id'];
@@ -253,7 +235,7 @@ class TangguhLelongController extends Controller
                 $pengesahan->status_ubah = 6;
                 $pengesahan->save();
 
-                $tangguhlelong = new TangguhLelong();
+                $tangguhlelong = new TangguhLelong;
                 $tangguhlelong->lelong_id = $request->lelong_id;
                 $tangguhlelong->lelongbid_id = $bidmarhun;
                 $tangguhlelong->norujukan = $lelongbidmarhun[0]['norujukan'];
@@ -288,8 +270,7 @@ class TangguhLelongController extends Controller
             ->get();
         // display only cwgn yg mohon tangguh 24.01.2023..to be continued..done
 
-        foreach($tangguh as $index=>$t)
+        foreach ($tangguh as $index => $t) {
-        {
             $sag = TangguhLelong::where('lelong_id', $t['lelong_id'])
                 ->where('kodcaw', $t['caw_code'])
                 ->where('status', '!=', 4)
@@ -318,8 +299,7 @@ class TangguhLelongController extends Controller
             ->get();
         // dd($pengesahan);
 
-        foreach($pengesahan as $index1=>$sah)
+        foreach ($pengesahan as $index1 => $sah) {
-        {
             $lelongbid = LelongBid::where('id', $sah->lelongbid_id)
                 ->where('norujukan', $sah->norujukan)
             // ->where('kodcaw', $caw_code)
@@ -347,8 +327,7 @@ class TangguhLelongController extends Controller
 
         $lelong = Lelong::where('id', $request->lelong_id)->get()->toArray();
 
-        foreach($lelbidmarhun as $bidmarhun)
+        foreach ($lelbidmarhun as $bidmarhun) {
-        {
             // dd($bidmarhun);
             $lelongbidmarhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
                 ->where('lelongbid.id', $bidmarhun)
@@ -415,8 +394,10 @@ class TangguhLelongController extends Controller
             $caw_code = $request->kodcaw;
 
         }
+
         return redirect()->route('pengesahan.senaraisahtangguh', [$request->lelong_id, $caw_code])->with('success', 'Pengesahan Berjaya');
     }
+
     // PC
     public function listtangguh($lelong_id, $caw_code)
     {
@@ -443,8 +424,7 @@ class TangguhLelongController extends Controller
             )
             ->get();
         // dd($tangguhlelong);
-               foreach($tangguhlelong as $index1=>$tanguhlel)
+        foreach ($tangguhlelong as $index1 => $tanguhlel) {
-               {
 
             $getkodcaw = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
                 ->where('lelong_id', $lelong_id)
@@ -456,10 +436,10 @@ class TangguhLelongController extends Controller
             // $tangguhlelong[$index1]['nama_caw'] = $getkodcaw;
 
         }
+
         // dd($tangguhlelong);
         return view('tangguhlelong.listtangguh', compact('tangguhlelong', 'lelong_id', 'caw_code'));
 
-
     }
 
     public function taglelbidmarhun($id, $norujukan, $tangguhlelong_id)
@@ -475,14 +455,11 @@ class TangguhLelongController extends Controller
 
         }
 
-        
         $tangguhlelong = GadaiMarhun::on($datatangguh[0]['kodcaw'])
             ->where('norujukan', $norujukan)
             ->get();
         // dd($tangguhlelong);
 
-        
-
         // $tangguhlelong = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan')
         // ->where('gadaimarhun.norujukan', $norujukan)
         // ->where('tangguhlelong.id', $tangguhlelong_id)
@@ -523,7 +500,7 @@ class TangguhLelongController extends Controller
         $currentdate = Carbon::now();
         $currentdate = $currentdate->toDateTimeString();
 
-        $current = new Carbon();
+        $current = new Carbon;
         $t_mohon = $current->toDateString();
 
         $selectedbid_id = $request->lelongbid_id;
@@ -531,48 +508,39 @@ class TangguhLelongController extends Controller
         $nokp = $request->nokp;
         $lelong_id = $request->lelong_id;
 
-        if(empty($selectedbid_id))
+        if (empty($selectedbid_id)) {
-        {
             return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed', 'Sila Pilih No Rujukan Terlebih Dahulu');
-        }
+        } else {
-        else
-        {
             $lelongbid = LelongBid::whereIn('lelongbid.id', $selectedbid_id)
                 ->get();
             // dd($lelongbid);
 
             $arraynorujukan = [];
 
-            foreach($lelongbid as $index1=>$bidmarhun)
+            foreach ($lelongbid as $index1 => $bidmarhun) {
-            {
                 // dd($bidmarhun->toArray());
                 $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $bidmarhun->id)
                     ->get();
                 $bidmarhun['lelongbidmarhun'] = $lelongbidmarhun->toArray();
 
-                if(empty($bidmarhun->nmarhuns))
+                if (empty($bidmarhun->nmarhuns)) {
-                {
                     return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed', 'Sila Maklum Operasi Kemaskini Harga Emas Lelong Terlebih Dahulu');
-                } 
+                } else {
-                else 
-                {
 
                     $bidmarhun['percents'] = round(($bidmarhun->pinjaman / $bidmarhun->nmarhuns * 100), 2);
 
                     $history = TangguhLelong::where('lelongbid_id', $bidmarhun->id)
                         ->first();
 
-                    if($history)
+                    if ($history) {
-                    {
                         return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed', 'Maaf No Rujukan Telah Wujud Dalam Senarai Mohon Tangguh');
 
-                    } elseif($bidmarhun->fasa == 2) 
+                    } elseif ($bidmarhun->fasa == 2) {
-                    {
                         // block tangguh sekiranya telah masuk fasa 2
                         return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed', 'Maaf No Rujukan Telah Berada Dalam Fasa 2');
 
                     } else {
-                        $tangguhlelong = new TangguhLelong(); //pastikan hanya 1 kali insert utk lelong_id & norujukan yg sama
+                        $tangguhlelong = new TangguhLelong; // pastikan hanya 1 kali insert utk lelong_id & norujukan yg sama
                         $tangguhlelong->kodcaw = $bidmarhun->kodcaw;
                         $tangguhlelong->lelong_id = $request->lelong_id;
                         $tangguhlelong->lelongbid_id = $bidmarhun->id;
@@ -583,7 +551,7 @@ class TangguhLelongController extends Controller
                         $tangguhlelong->status = 0;
                         $tangguhlelong->save();
 
-                        $pengesahan = new Pengesahan();
+                        $pengesahan = new Pengesahan;
                         $pengesahan->lelong_id = $request->lelong_id;
                         $pengesahan->lelongbid_id = $bidmarhun->id;
                         $pengesahan->lelongbidmarhun_id = 0;
@@ -609,15 +577,15 @@ class TangguhLelongController extends Controller
 
             // get staf cwgn roles harian
             $roles_harian_penilai = Http::get(config('app.api_url_kaunter').'api/roles_harian/'.$user->kodcaw, [
-                'role_harian' => 'penilai'
+                'role_harian' => 'penilai',
             ])->json();
 
             $roles_harian_khazanah = Http::get(config('app.api_url_kaunter').'api/roles_harian/'.$user->kodcaw, [
-                'role_harian' => 'khazanah'
+                'role_harian' => 'khazanah',
             ])->json();
 
             $roles_harian_pc = Http::get(config('app.api_url_kaunter').'api/roles_harian/'.$user->kodcaw, [
-                'role_harian' => 'pc'
+                'role_harian' => 'pc',
             ])->json();
 
             // dd($roles_harian_penilai,$roles_harian_khazanah,$roles_harian_pc);
@@ -637,7 +605,7 @@ class TangguhLelongController extends Controller
         $currentdate = Carbon::now();
         $currentdate = $currentdate->toDateTimeString();
 
-        $current = new Carbon();
+        $current = new Carbon;
         $t_mohon = $current->toDateString();
 
         $selectedbid_id = $lelongbid_id;
@@ -645,14 +613,12 @@ class TangguhLelongController extends Controller
         // $nokp = $request->nokp;
         // $lelong_id = $request->lelong_id;
 
-        
         $lelongbid = LelongBid::where('lelongbid.id', $selectedbid_id)
             ->get();
 
         $arraynorujukan = [];
 
-            foreach($lelongbid as $index1=>$bidmarhun)
+        foreach ($lelongbid as $index1 => $bidmarhun) {
-            {
 
             $cust = Gadai::on($bidmarhun->kodcaw)->where('norujukan', $bidmarhun->norujukan)
                 ->first();
@@ -684,20 +650,19 @@ class TangguhLelongController extends Controller
 
         // get staf cwgn roles harian
         $roles_harian_penilai = Http::get(config('app.api_url_kaunter').'api/roles_harian/'.$user->kodcaw, [
-                'role_harian' => 'penilai'
+            'role_harian' => 'penilai',
         ])->json();
 
         $roles_harian_khazanah = Http::get(config('app.api_url_kaunter').'api/roles_harian/'.$user->kodcaw, [
-                'role_harian' => 'khazanah'
+            'role_harian' => 'khazanah',
         ])->json();
 
         $roles_harian_pc = Http::get(config('app.api_url_kaunter').'api/roles_harian/'.$user->kodcaw, [
-                'role_harian' => 'pc'
+            'role_harian' => 'pc',
         ])->json();
 
         // dd($roles_harian_penilai,$roles_harian_khazanah,$roles_harian_pc);
 
-        
         // return view('pdf.brgtangguhlelong',compact('lelongbid','lelongbidmarhun','customer','cwgn','t_mohon','nokp','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc'));
         $pdf = PDF::loadView('pdf.brgtangguhlelong', compact('lelongbid', 'lelongbidmarhun', 'customer', 'cwgn', 't_mohon', 'nokp', 'roles_harian_penilai', 'roles_harian_khazanah', 'roles_harian_pc'))
             ->setPaper('a4', 'potrait');
@@ -754,6 +719,7 @@ class TangguhLelongController extends Controller
 
             $oprtangguh[$index1]['opr'] = $lelong;
         }
+
         return view('tangguhlelong.senaraimohontangguh', compact('user', 'tangguh', 'tlhtangguh', 'oprtangguh'));
     }
 
@@ -789,11 +755,9 @@ class TangguhLelongController extends Controller
             ->whereIn('tangguhlelong.status', [0, 1, 2, 3, 4])
             ->get();
 
-    
         // dd($pengesahan);
 
-        foreach($pengesahan as $index1=>$sah)
+        foreach ($pengesahan as $index1 => $sah) {
-        {
             $lelongbid = LelongBid::where('id', $sah->lelongbid_id)
                 ->where('norujukan', $sah->norujukan)
             // ->where('kodcaw', $caw_code)
@@ -833,7 +797,7 @@ class TangguhLelongController extends Controller
 
         return response(base64_decode($tangguh['filename']), 200, [
             'Content-type' => 'application/'.$tangguh['file_type'],
-            'Content-Disposition' => 'inline; filename='.$tangguh['norujukan']
+            'Content-Disposition' => 'inline; filename='.$tangguh['norujukan'],
         ]);
     }
 
@@ -868,7 +832,7 @@ class TangguhLelongController extends Controller
         $tangguhlelong = TangguhLelong::where('lelongbid_id', '=', $request->lelongbidid_mdl)
             ->where('norujukan', '=', $request->norujukan_mdl)->first();
 
-        if($request->sahkan == "1") {
+        if ($request->sahkan == '1') {
             $tangguhlelong->status = 4;
             $tangguhlelong->ditangguh_oleh = $user->id;
             $tangguhlelong->ditangguh_pada = $currentdate;
@@ -892,9 +856,10 @@ class TangguhLelongController extends Controller
             $updategadai = Http::withOptions(['verify' => config('app.api_verify')])
                 ->post(config('app.api_url').'taglel/revert', [
                     'kodcaw' => $tangguhlelong->kodcaw,
-                'norujukan'=> $request->norujukan_mdl
+                    'norujukan' => $request->norujukan_mdl,
                 ])
                 ->json();
+
             return redirect()->route('pengesahan.opsenaraisahtangguh', [$tangguhlelong->lelong_id, $tangguhlelong->kodcaw])
                 ->with('success', 'Tangguh Lelong Telah Di Lulus.');
 
@@ -906,8 +871,6 @@ class TangguhLelongController extends Controller
                 ->with('success', 'Tangguh Lelong Tidak Di Lulus.');
         }
 
-
-        
     }
 
     public function senaraitlhtangguh()
@@ -927,8 +890,7 @@ class TangguhLelongController extends Controller
             ->get();
         // display only cwgn yg mohon tangguh 24.01.2023..to be continued ..done
 
-        foreach($lelong as $index=>$info)
+        foreach ($lelong as $index => $info) {
-        {
             $sag = TangguhLelong::where('lelong_id', $info['lelong_id'])
                 ->where('kodcaw', $info['caw_code'])
                 ->where(function ($query) {
@@ -941,8 +903,7 @@ class TangguhLelongController extends Controller
 
             $tangguh[$index]['bilsag'] = $sag;
 
-            if($info['sts_lelong'] == '0' )
+            if ($info['sts_lelong'] == '0') {
-            {
                 array_push($arraysms, ['info' => $info, 'sag' => $sag]);
             } else {
                 array_push($arraysls, ['info' => $info, 'sag' => $sag]);
@@ -953,7 +914,6 @@ class TangguhLelongController extends Controller
         return view('tangguhlelong.senleltlhtangguh', compact('arraysms', 'arraysls', 'lelong', 'arrayinfo'));
     }
 
-    
     public function operasisenlulustangguh($lelong_id, $caw_code)
     {
         $caw_code = $caw_code;
@@ -971,8 +931,7 @@ class TangguhLelongController extends Controller
 
         // dd($tangguh);
         if ($tangguh) {
-            foreach($tangguh as $index1=>$sah)
+            foreach ($tangguh as $index1 => $sah) {
-            {
                 $lelongbid = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
                     ->where('lelong.id', $sah->lelong_id)
                     ->get();
@@ -1012,7 +971,7 @@ class TangguhLelongController extends Controller
 
         return response(base64_decode($tangguh['filename']), 200, [
             'Content-type' => 'application/'.$tangguh['file_type'],
-            'Content-Disposition' => 'inline; filename='.$tangguh['norujukan']
+            'Content-Disposition' => 'inline; filename='.$tangguh['norujukan'],
         ]);
 
     }
@@ -1064,15 +1023,15 @@ class TangguhLelongController extends Controller
         $lelong_id_asal = $request->lelong_id;
         $lelong_bid = LelongBid::find($request->lelong_bid_id);
 
-        $log_user = new LogUser();
+        $log_user = new LogUser;
         $log_user->user_id = $user->id;
         $log_user->date = $current_date;
         $log_user->username = $user->username;
         $log_user->nama_user = $user->name;
         $log_user->norujukan = $lelong_bid->norujukan;
 
-        if ($request->jenis_tangguh == "hapus") {
+        if ($request->jenis_tangguh == 'hapus') {
-            $lelong_bid_tangguh_lelong = new TangguhLelong();
+            $lelong_bid_tangguh_lelong = new TangguhLelong;
             $lelong_bid_tangguh_lelong->lelong_id = $lelong_bid->lelong_id;
             $lelong_bid_tangguh_lelong->lelongbid_id = $lelong_bid->id;
             $lelong_bid_tangguh_lelong->norujukan = $lelong_bid->norujukan;
@@ -1080,14 +1039,14 @@ class TangguhLelongController extends Controller
             $lelong_bid_tangguh_lelong->tarikhtangguh = $current_date;
             $lelong_bid_tangguh_lelong->ditangguh_oleh = $user->id;
             $lelong_bid_tangguh_lelong->ditangguh_pada = $current_date;
-            $lelong_bid_tangguh_lelong->nota = "Ditangguh Oleh Operasi (" . $user->name . ")";
+            $lelong_bid_tangguh_lelong->nota = 'Ditangguh Oleh Operasi ('.$user->name.')';
             $lelong_bid_tangguh_lelong->kodcaw = $lelong_bid->kodcaw;
             $lelong_bid_tangguh_lelong->save();
 
             Http::withOptions(['verify' => config('app.api_verify')])
                 ->post(config('app.api_url').'taglel/revert', [
                     'kodcaw' => $lelong_bid->kodcaw,
-                    'norujukan' => $lelong_bid->norujukan
+                    'norujukan' => $lelong_bid->norujukan,
                 ])->json();
 
             $log_user->nota = 'Tangguh Lelong';

app/Http/Controllers/TetapanController.php

@@ -2,25 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Http\Request;
-use Spatie\Permission\Models\Role;
-use Spatie\Permission\Models\Permission;
-use Carbon\Carbon;
-
-use App\Models\User;
-use App\Models\Gadai;
-use App\Models\GadaiMarhun;
 use App\Models\Cawangan;
-use App\Models\TransaksiKeuntungan;
 use App\Models\Tetapan;
-
+use Carbon\Carbon;
-use DateTime;
+use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Input;
-
-
-
 
 class TetapanController extends Controller
 {
@@ -56,7 +41,4 @@ class TetapanController extends Controller
         return redirect()->route('tetapan.parameter')
             ->with('success', 'Tetapan Berjaya');
     }
-
-
-
 }

app/Http/Controllers/UserController.php

@@ -13,6 +13,7 @@ class UserController extends Controller
 {
     /**
      * Register user
+     *
      * @param request
      * @return response
      */
@@ -22,18 +23,19 @@ class UserController extends Controller
         $this->validate($request, [
             'name' => 'required',
             'email' => 'required|email',
-            'password' => 'required|min:6'
+            'password' => 'required|min:6',
         ]);
 
         User::create([
             'name' => $request->name,
             'email' => $request->email,
-            'password' => Hash::make($request->password)
+            'password' => Hash::make($request->password),
         ]);
     }
 
     /**
      * Login page
+     *
      * @param NA
      * @return view
      */
@@ -44,6 +46,7 @@ class UserController extends Controller
 
     /**
      * User Login
+     *
      * @param request
      * @return response
      */
@@ -51,7 +54,7 @@ class UserController extends Controller
     {
         $this->validate($request, [
             'email' => 'required|email',
-            'password' => 'required|min:6'
+            'password' => 'required|min:6',
         ]);
 
         $user = User::where('email', $request->email)->first();
@@ -59,13 +62,16 @@ class UserController extends Controller
             if (Hash::check($request->password, $user->password)) {
                 return back()->with('success', 'Success! You are logged in');
             }
+
             return back()->with('failed', 'Failed! Invalid password');
         }
+
         return back()->with('failed', 'Failed! Invalid email');
     }
 
     /**
      * Forgot password
+     *
      * @param NA
      * @return view
      */
@@ -76,6 +82,7 @@ class UserController extends Controller
 
     /**
      * Validate token for forgot password
+     *
      * @param token
      * @return view
      */
@@ -85,13 +92,16 @@ class UserController extends Controller
         // dd($user);
         if ($user) {
             $email = $user->email;
+
             return view('auth.change-password', compact('email'));
         }
+
         return redirect()->route('forgot-password')->with('failed', 'Password reset link is expired');
     }
 
     /**
      * Reset password
+     *
      * @param request
      * @return response
      */
@@ -113,24 +123,31 @@ class UserController extends Controller
         $user['is_verified'] = 0;
         $user->save();
 
-        Mail::to($request->email)->send(new ResetPassword($user->name, $token));
+        $resetUrl = url('/forgot-password/' . $token);
+
+        Mail::to($request->email)->send(new ResetPassword($user->name, $resetUrl));
+
+        Mail::to($request->email)->send(new ResetPassword($user->name, $resetUrl));
 
         if (Mail::failures() != 0) {
             return back()->with('success', 'Berjaya DiHantar! Pautan Lupa Katalaluan Telah Dihantarkan Kepada Alamat Emel Anda.');
         }
+
         return back()->with('failed', 'Failed! there is some issue with email provider');
     }
 
     /**
      * Change password
+     *
      * @param request
      * @return response
      */
-    public function updatePassword(Request $request) {
+    public function updatePassword(Request $request)
+    {
         $this->validate($request, [
             'email' => 'required',
             'password' => 'required|min:6',
-            'confirm_password' => 'required|same:password'
+            'confirm_password' => 'required|same:password',
         ]);
 
         $user = User::where('email', $request->email)->first();
@@ -146,6 +163,7 @@ class UserController extends Controller
 
             return redirect()->route('login')->with('success', 'Berjaya! Katalaluan Anda Telah Didaftarkan.');
         }
+
         return redirect()->route('forgot-password')->with('failed', 'Gadal! Sila Cuba Lagi...');
     }
 

app/Http/Kernel.php

@@ -37,6 +37,7 @@ class Kernel extends HttpKernel
             \Illuminate\Session\Middleware\StartSession::class,
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+            \App\Http\Middleware\EnsureActiveAccount::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],

app/Http/Middleware/EnsureActiveAccount.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Facades\Auth;
+
+class EnsureActiveAccount
+{
+    public function handle($request, Closure $next)
+    {
+        $guard = Auth::guard('web');
+        $user = $guard->user();
+
+        if ($user && $user->status !== 'active') {
+            $guard->logout();
+            $request->session()->invalidate();
+            $request->session()->regenerateToken();
+
+            $message = 'Akaun anda tidak aktif. Sila hubungi pentadbir.';
+            if ($request->expectsJson()) {
+                return response()->json(['message' => $message], 403);
+            }
+
+            return redirect()->route('login')->withErrors(['username' => $message]);
+        }
+
+        return $next($request);
+    }
+}

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -12,8 +12,6 @@ class RedirectIfAuthenticated
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
      * @param  string|null  ...$guards
      * @return mixed
      */

app/Jobs/AutoTamatLelong.php

@@ -2,23 +2,20 @@
 
 namespace App\Jobs;
 
+use App\Events\LelongNotify;
+use App\Models\Cart;
+use App\Models\CawanganLelong;
+use App\Models\Lelong;
+use App\Models\LogUser;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use App\Models\Lelong;
 use Illuminate\Support\Carbon;
-use App\Events\LelongNotify;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
-use App\Models\LogUser;
-use App\Models\User;
-use App\Models\CawanganLelong;
-use App\Models\Cart;
-
-
 
 class AutoTamatLelong implements ShouldQueue
 {
@@ -53,8 +50,7 @@ class AutoTamatLelong implements ShouldQueue
             ->update(['sts_lelong' => 2]);
 
         $cawlelong = CawanganLelong::where('lelong_id', '=', $this->id)->get();
-                foreach($cawlelong as $cawlel) //save old harga asas
+        foreach ($cawlelong as $cawlel) { // save old harga asas
-                {
             // $cawlel->masatamat_lelong = $currenttime;
             $cawlel->status_online = 0;   // start lelong
             $cawlel->save();
@@ -62,8 +58,7 @@ class AutoTamatLelong implements ShouldQueue
 
         $hapuscart = Cart::truncate();
 
-        
+        $response = null;
-
         $getnoajk = User::where('user_type', 3)->get();
         foreach ($getnoajk as $notifikasi) {
             $mobile_no = '6'.$notifikasi->notelbimbit;
@@ -76,7 +71,7 @@ class AutoTamatLelong implements ShouldQueue
                 'type' => 'text',
                 'message' => 'Lelongan Telah Tamat, Sila Jana Pemenang',
                 'instance_id' => config('app.wabot_instances_id'),
-                    'access_token' => config('app.wabot_token_keys')
+                'access_token' => config('app.wabot_token_keys'),
             ]);
         }
 
@@ -90,7 +85,7 @@ class AutoTamatLelong implements ShouldQueue
         $loguser->nota = 'Lelongan Tamat';
         $loguser->save();
 
-                Log::info("Lelongan Telah Tamat" . $response);
+        Log::info('Lelongan Telah Tamat', ['response' => $response]);
         // }
 
         // event(new LelongNotify('stop'));

app/Jobs/Concerns/ResolvesJanaNotisJumlah.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Jobs\Concerns;
+
+use App\Models\LelongBid;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
+
+trait ResolvesJanaNotisJumlah
+{
+    /**
+     * Resolve total amount (jumlah) for a SAG, matching PDF jananotis calculation.
+     *
+     * @return string|null Formatted amount e.g. "1,234.56"
+     */
+    protected function resolveJanaNotisJumlah($kodcaw, $lelongId, $suratnotis)
+    {
+        $lelongBid = LelongBid::where('lelong_id', $lelongId)
+            ->where('norujukan', $suratnotis->norujukan)
+            ->first();
+
+        if (! $lelongBid) {
+            Log::warning('Jana notis jumlah: lelong bid not found', [
+                'lelong_id' => $lelongId,
+                'norujukan' => $suratnotis->norujukan,
+            ]);
+
+            return null;
+        }
+
+        $tagbaru = (string) $suratnotis->tagbaru;
+        $jeniskeuntungan = $tagbaru === '1' ? 'onepercent' : 'asal';
+
+        $api = Http::get(config('app.api_ujrah_url').'get/upahtawarruqbytarikh', [
+            'kodcaw' => $kodcaw,
+            'norujukan' => $suratnotis->norujukan,
+            'tarikh' => $lelongBid->t_lelong,
+            'jeniskeuntungan' => $jeniskeuntungan,
+        ])->json();
+
+        if (! is_array($api)) {
+            Log::warning('Jana notis jumlah: API returned null', [
+                'norujukan' => $suratnotis->norujukan,
+                'jeniskeuntungan' => $jeniskeuntungan,
+            ]);
+
+            return null;
+        }
+
+        $nilaipembiayaan = (float) $lelongBid->pinjaman;
+
+        if ($tagbaru === '1') {
+            $jumlah = $nilaipembiayaan + (float) ($api['pendapatan'] ?? 0);
+        } else {
+            $jumlah = $nilaipembiayaan + (float) ($api['upahsemasa'] ?? 0);
+        }
+
+        return number_format($jumlah, 2, '.', ',');
+    }
+}

app/Jobs/GenerateJanaNotisPdf.php

@@ -0,0 +1,179 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Cawangan;
+use App\Models\Customer;
+use App\Models\Gadai;
+use App\Models\JanaNotisExport;
+use App\Models\Lelong;
+use App\Models\LelongBid;
+use App\Models\User;
+use Carbon\Carbon;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
+use PDF;
+use Throwable;
+
+class GenerateJanaNotisPdf implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $timeout = 600;
+
+    public $tries = 1;
+
+    protected $exportId;
+
+    public function __construct($exportId)
+    {
+        $this->exportId = $exportId;
+        $this->onQueue('jana-notis');
+    }
+
+    public function handle()
+    {
+        ini_set('memory_limit', '2048M');
+
+        $export = JanaNotisExport::find($this->exportId);
+        if (! $export) {
+            return;
+        }
+
+        $export->update([
+            'status' => JanaNotisExport::STATUS_PROCESSING,
+            'error_message' => null,
+        ]);
+
+        $user = User::find($export->user_id);
+        $caw = Cawangan::where('caw_code', $export->kodcaw)->first();
+        $lelong_id = $export->lelong_id;
+        $fasa = (int) $export->fasa;
+
+        Log::info("Jana notis fasa {$fasa} (queued): {$export->kodcaw}, ".($user->name ?? 'unknown'));
+
+        $tarikh_cetak = Carbon::now()->toDateString();
+        $lelongid = Lelong::find($lelong_id);
+
+        $arraynorujukan = LelongBid::where('lelong_id', $lelong_id)
+            ->where('kodcaw', $caw->caw_code)
+            ->pluck('norujukan');
+
+        $marhuns = Gadai::on($caw->caw_code)
+            ->whereIn('norujukan', $arraynorujukan)
+            ->select('nokp', 'norujukan', 'bakipjm', 'tagbaru')
+            ->orderBy('nokp', 'asc')
+            ->get();
+
+        $customers = Customer::whereIn('kpbaru', $marhuns->pluck('nokp'))
+            ->orWhereIn('kplama', $marhuns->pluck('nokp'))
+            ->join('poskod', 'customer.poskod', '=', 'poskod.poskod')
+            ->join('daerah', 'poskod.koddaerah', '=', 'daerah.koddaerah')
+            ->join('negeri', 'poskod.kodnegeri', '=', 'negeri.kodnegeri')
+            ->get();
+
+        $customers_keyBy_noKp = $customers->keyBy(function ($item) {
+            if ($item->kpbaru != '') {
+                return $item->kpbaru;
+            }
+            if ($item->kplama != '') {
+                return $item->kplama;
+            }
+        });
+
+        foreach ($marhuns as $index => $marhun) {
+            if (isset($customers_keyBy_noKp[$marhun->nokp])) {
+                $marhuns[$index]['nama'] = $customers_keyBy_noKp[$marhun->nokp];
+            }
+
+            $getdatalelongbid = LelongBid::where('lelong_id', $lelong_id)
+                ->where('norujukan', $marhun->norujukan)
+                ->first();
+
+            $tagbaru = $marhun->tagbaru;
+            if ($tagbaru == '0') {
+                $getkeuntunganhinggatarikhlelong = Http::get(config('app.api_ujrah_url').'get/upahtawarruqbytarikh', [
+                    'kodcaw' => $export->kodcaw,
+                    'norujukan' => $marhun->norujukan,
+                    'tarikh' => $getdatalelongbid['t_lelong'],
+                    'jeniskeuntungan' => 'asal',
+                ])->json();
+
+                $nilaitebus = (float) $getkeuntunganhinggatarikhlelong['harga_tebus'];
+                $nilaipembiayaan = (float) $getdatalelongbid['pinjaman'];
+                $nilaikeuntungan = (float) $getkeuntunganhinggatarikhlelong['upahsemasa'];
+                $jumlah = $nilaipembiayaan + $nilaikeuntungan;
+
+                $marhuns[$index]['nilaitebus'] = $nilaitebus;
+                $marhuns[$index]['nilaipembiayaan'] = $nilaipembiayaan;
+                $marhuns[$index]['nilaikeuntungan'] = $nilaikeuntungan;
+                $marhuns[$index]['jumlah'] = $jumlah;
+            } elseif ($tagbaru == '1') {
+                $getkeuntunganhinggatarikhlelong = Http::get(config('app.api_ujrah_url').'get/upahtawarruqbytarikh', [
+                    'kodcaw' => $export->kodcaw,
+                    'norujukan' => $marhun->norujukan,
+                    'tarikh' => $getdatalelongbid['t_lelong'],
+                    'jeniskeuntungan' => 'onepercent',
+                ])->json();
+
+                $nilaitebus = (float) $getkeuntunganhinggatarikhlelong['harga_tebus'];
+                $nilaipembiayaan = (float) $getdatalelongbid['pinjaman'];
+                $nilaipendapatan = (float) $getkeuntunganhinggatarikhlelong['pendapatan'];
+                $nilaikeuntungan = (float) $getkeuntunganhinggatarikhlelong['keuntungan'];
+                $nilaiujrah = (float) $getkeuntunganhinggatarikhlelong['ujrah'];
+                $jumlah = $nilaipembiayaan + $nilaipendapatan;
+
+                $marhuns[$index]['nilaitebus'] = $nilaitebus;
+                $marhuns[$index]['nilaipembiayaan'] = $nilaipembiayaan;
+                $marhuns[$index]['nilaikeuntungan'] = $nilaikeuntungan;
+                $marhuns[$index]['nilaiujrah'] = $nilaiujrah;
+                $marhuns[$index]['jumlah'] = $jumlah;
+            }
+        }
+
+        $view = $fasa === 2 ? 'pdf.jananotisfasa2_new' : 'pdf.jananotis_new';
+        $fileName = 'Penjanaan Notis Fasa '.$fasa.':Batch Lelong '.$lelong_id.'.pdf';
+        $relativePath = 'jana_notis/'.$export->kodcaw.'/'.$lelong_id.'_fasa'.$fasa.'_'.$export->id.'.pdf';
+
+        $pdf = PDF::loadView($view, compact('marhuns', 'lelongid', 'caw', 'tarikh_cetak'))
+            ->setPaper('a4', 'potrait');
+
+        Storage::disk('local')->put($relativePath, $pdf->output());
+
+        $export->update([
+            'status' => JanaNotisExport::STATUS_COMPLETED,
+            'file_path' => $relativePath,
+            'file_name' => $fileName,
+            'error_message' => null,
+        ]);
+
+        if ($fasa === 2) {
+            WhatsappNotisLelongFasa2::dispatch($export->user_id, $export->kodcaw, $export->lelong_id);
+        } else {
+            WhatsappNotisLelongFasa1::dispatch($export->user_id, $export->kodcaw, $export->lelong_id);
+        }
+
+        Log::info("Queued WhatsApp Jana Notis fasa {$fasa} for lelong {$export->lelong_id}");
+    }
+
+    public function failed(Throwable $exception)
+    {
+        $export = JanaNotisExport::find($this->exportId);
+        if ($export) {
+            $export->update([
+                'status' => JanaNotisExport::STATUS_FAILED,
+                'error_message' => $exception->getMessage(),
+            ]);
+        }
+
+        Log::error('GenerateJanaNotisPdf failed: '.$exception->getMessage(), [
+            'export_id' => $this->exportId,
+        ]);
+    }
+}

app/Jobs/HantarMail.php

@@ -2,22 +2,22 @@
 
 namespace App\Jobs;
 
+use App\Mail\Pemenang;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-
 use Illuminate\Support\Facades\Mail;
-use App\Mail\Pemenang;
 
 class HantarMail implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public $user_email;
+
     public $user_name;
+
     protected $total_bid_win_converted;
 
     /**

app/Jobs/NotifyJanaNotis.php

@@ -3,14 +3,11 @@
 namespace App\Jobs;
 
 use App\Mail\NotifyAdmin;
-use App\Mail\NotifyJanaNotis as MailNotifyJanaNotis;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
 
 class NotifyJanaNotis implements ShouldQueue
@@ -18,9 +15,13 @@ class NotifyJanaNotis implements ShouldQueue
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public $user_id;
+
     public $user_kodcaw;
+
     private $user_name;
+
     private $description;
+
     private $date_time;
 
     /**

app/Jobs/WhatsappNotisLelongFasa1.php

@@ -2,166 +2,143 @@
 
 namespace App\Jobs;
 
+use App\Jobs\Concerns\ResolvesJanaNotisJumlah;
+use App\Models\Cawangan;
+use App\Models\Customer;
+use App\Models\Gadai;
+use App\Models\Lelong;
+use App\Models\LelongBid;
+use App\Services\WhatsAppCloudService;
+use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-
-use App\Models\Cawangan;
-use Carbon\Carbon;
-use App\Models\Lelong;
-use App\Models\LelongCawangan;
-use App\Models\LelongBid;
-use App\Models\Gadai;
-use App\Models\Customer;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Http;
-use App\Models\CawanganLelong;
-use Illuminate\Support\Facades\Artisan;
-use DateTime;
 
 class WhatsappNotisLelongFasa1 implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, ResolvesJanaNotisJumlah, SerializesModels;
+
+    public $timeout = 600;
+
+    public $tries = 1;
 
     public $user_id;
+
     public $user_kodcaw;
+
     protected $lelong_id;
 
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
     public function __construct($user_id, $user_kodcaw, $lelong_id)
     {
         $this->user_id = $user_id;
         $this->user_kodcaw = $user_kodcaw;
         $this->lelong_id = $lelong_id;
+        $this->onQueue('default');
     }
 
-    /**
+    public function handle(WhatsAppCloudService $whatsapp)
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
     {
-        // $user =  Auth::user();
+        if (! $whatsapp->isEnabled()) {
-        $caw = Cawangan::where('caw_code', '=', $this->user_kodcaw)->first();
+            Log::warning('WhatsappNotisLelongFasa1 skipped: WhatsApp Cloud API not enabled.');
 
-        $currentdate = Carbon::now();
+            return;
+        }
 
-        $lel = Lelong::with('cawangan')->find($this->lelong_id);
+        $caw = Cawangan::where('caw_code', $this->user_kodcaw)->first();
-        // dd($lel->tarikh_lelong);
+        if (! $caw) {
+            Log::error('WhatsappNotisLelongFasa1: cawangan not found', ['kodcaw' => $this->user_kodcaw]);
 
-        $cawanganDetail = $lel->cawangan->find($caw->id);
+            return;
-        $lelong_id = $this->lelong_id;
+        }
-        $cawangan = Cawangan::with(["lelongBid" => function($q) use ($lelong_id){
+
-            $q->where('lelong_id', '=', $lelong_id)->select('id','caw_id','kodcaw','norujukan','pinjaman','bakiupah','hargaasas','nilaimarhun','cajlelong','baki','t_lelong');
+        $lel = Lelong::find($this->lelong_id);
-        }])
+        if (! $lel) {
-        ->where('caw_code','=',$cawanganDetail->caw_code)->first();
+            Log::error('WhatsappNotisLelongFasa1: lelong not found', ['lelong_id' => $this->lelong_id]);
-        $lelongbid_data_pluck_norujukan = $cawangan->lelongBid->pluck('norujukan')->toArray();
+
-        $gadai_all = Gadai::on($cawanganDetail->caw_code)->whereIn('gadai.norujukan', $lelongbid_data_pluck_norujukan)
+            return;
+        }
+
+        $arraynorujukan = LelongBid::where('lelong_id', $this->lelong_id)
+            ->where('kodcaw', $caw->caw_code)
+            ->pluck('norujukan');
+
+        $gadaiAll = Gadai::on($caw->caw_code)
+            ->whereIn('norujukan', $arraynorujukan)
             ->orderBy('nokp', 'asc')
-        ->orderBy('norujukan','ASC')
+            ->orderBy('norujukan', 'asc')
             ->get();
 
-        $customers_list = $gadai_all->pluck('nokp')->unique();
+        $customers = Customer::whereIn('kpbaru', $gadaiAll->pluck('nokp'))
-        $customers = Customer::whereIn('kpbaru', $customers_list)
+            ->orWhereIn('kplama', $gadaiAll->pluck('nokp'))
-        ->orWhereIn('kplama', $customers_list)
             ->select('id', 'kpbaru', 'kplama', 'nama', 'telefon')
-        ->get()->keyBy('id');
+            ->get();
 
-        $customers_keyBy_noKp = $customers->keyBy(function ($item) {
+        $customersByKp = $customers->keyBy(function ($item) {
             if ($item->kpbaru != '') {
                 return $item->kpbaru;
-            } else if ($item->kplama != '') {
+            }
+            if ($item->kplama != '') {
                 return $item->kplama;
             }
         });
 
-        $customers_pluck_notel = $customers_keyBy_noKp->pluck('telefon');
+        $tarikhLelong = Carbon::parse($lel->tarikh_lelong)->format('d-m-Y');
-        // dd($customers_pluck_notel);
+        $tarikhSebelum = Carbon::parse($lel->tarikh_lelong)->subDays(3)->format('d-m-Y');
-        foreach($customers_pluck_notel as $index1 =>$custphone) {
+        $template = config('whatsapp.jana_notis_template');
-            // dd($custphone);
+        $lang = config('whatsapp.jana_notis_template_lang');
-            $special = preg_match('/[\'^£$%&*()}{@#~?><>,|=_+¬-]/', $custphone);
-                // dump($special);
-                if($special == 0){
-                    if($custphone == ''){
-                        $newtel = '';
-                    }elseif($custphone <> ''){
-                        $newtel = '6'.$custphone;
-                    }
-                }
-                elseif($special == 1){
-                    if($custphone == ''){
-                        $newtel = '';
-                    }elseif($custphone <> ''){
-                    $newtel = '6'.str_replace( array( '-' ), '', $custphone);
-                    }
-                }
-                // dump($newtel);
 
-        }
+        foreach ($gadaiAll as $suratnotis) {
-        $lelong_bid_all_groupby_norujukan = $cawangan->lelongBid->groupBy('norujukan');
+            if (! isset($customersByKp[$suratnotis->nokp])) {
-        $lelong_all_keyBy_norujukan = $gadai_all->keyBy('norujukan');
+                continue;
-        foreach($lelong_bid_all_groupby_norujukan as $index7=>$lelongbid){
-            // dd($notis_all_keyBy_norujukan);
-            if($lelong_all_keyBy_norujukan[$index7]){
-               
-                $gadai_true = $lelong_all_keyBy_norujukan[$index7];
-                $gadai_true['data_lelongbid'] = $lelongbid;
             }
 
-        }
+            $customer = $customersByKp[$suratnotis->nokp];
-        // dd($gadai_all);
+            $recipient = $whatsapp->resolveRecipient($customer->telefon);
-        foreach ($gadai_all as $index => $suratnotis) {
+            if (! $recipient) {
-            $datanotisbid = $suratnotis['data_lelongbid'][0]->fasa;
+                Log::warning('WhatsappNotisLelongFasa1: invalid phone', [
-            // dd($suratnotis);
+                    'nokp' => $suratnotis->nokp,
-            if($customers_keyBy_noKp[$suratnotis->nokp])
+                    'norujukan' => $suratnotis->norujukan,
-            {
-                $mobile_no = '60178916936';
-                // $mobile_no = $newtel;
-                $user_true = $customers_keyBy_noKp[$suratnotis->nokp];
-                $nama = $user_true->nama;
-                $t_lelong = Carbon::parse($lel->tarikh_lelong);
-                $t_lelongf1 = $t_lelong->format('d-m-Y');
-                $cawname = $caw->caw_name;
-                $para2blast = $caw->para2blast;
-                $myDateTime = DateTime::createFromFormat('Y-m-d', $lel->tarikh_lelong );
-                $datez = $myDateTime->modify('-3 day')->format('d-m-Y');
-                // dd($t_matang1);
-                    $message = '*LELONGAN AWAM BARANG GADAIAN PADA '.$t_lelongf1.'*
-                 
-Nama: *'.$nama.'* 
-No.KP: *'.$suratnotis->nokp.'*'.'
-No.Rujukan: *'.$suratnotis->norujukan.'* 
-Cawangan: *'.$cawname.'*
-Waktu Lelong: *10.30Pagi*
-
-Tuan/Puan adalah dikehendaki untuk membuat urusan berikut dikaunter cawangan pada atau sebelum *'.$datez.'*:-
-
-'.$para2blast.'.
-
-Terima Kasih';
-
-                if(config('app.env') != 'production'){
-                    $mobile_no = config('app.admin_phone_number');
-                }
-                $response = Http::get(config('app.wabot_api'), [
-                    'number' => $mobile_no,
-                    'type' => 'text',
-                    'message' =>  $message,
-                    'instance_id' => config('app.wabot_instances_id'),
-                    'access_token' => config('app.wabot_token_keys')
                 ]);
 
-                Log::info("WABOT - Notis Lelongan Fasa 1" . $response);
+                continue;
             }
-            sleep(2);
+
+            $jumlah = $this->resolveJanaNotisJumlah($caw->caw_code, $this->lelong_id, $suratnotis);
+            if ($jumlah === null) {
+                Log::warning('WhatsappNotisLelongFasa1: skip send, jumlah unavailable', [
+                    'norujukan' => $suratnotis->norujukan,
+                ]);
+
+                continue;
+            }
+
+            if (empty($caw->notel)) {
+                Log::warning('WhatsappNotisLelongFasa1: skip send, cawangan phone missing', [
+                    'kodcaw' => $caw->caw_code,
+                    'norujukan' => $suratnotis->norujukan,
+                ]);
+
+                continue;
+            }
+
+            // {{1}} nama, {{2}} norujukan, {{3}} jumlah, {{4}} tarikh lelong,
+            // {{5}} tarikh akhir bayaran, {{6}} telefon cawangan, {{7}} cawangan
+            $bodyParams = [
+                $customer->nama,
+                $suratnotis->norujukan,
+                $jumlah,
+                $tarikhLelong,
+                $tarikhSebelum,
+                $caw->notel,
+                $caw->caw_name,
+            ];
+
+            $whatsapp->sendTemplate($recipient, $template, $bodyParams, $lang);
+
+            usleep(300000); // 0.3s soft rate-limit
         }
     }
 }

app/Jobs/WhatsappNotisLelongFasa2.php

@@ -2,166 +2,143 @@
 
 namespace App\Jobs;
 
+use App\Jobs\Concerns\ResolvesJanaNotisJumlah;
+use App\Models\Cawangan;
+use App\Models\Customer;
+use App\Models\Gadai;
+use App\Models\Lelong;
+use App\Models\LelongBid;
+use App\Services\WhatsAppCloudService;
+use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-
-use App\Models\Cawangan;
-use Carbon\Carbon;
-use App\Models\Lelong;
-use App\Models\LelongCawangan;
-use App\Models\LelongBid;
-use App\Models\Gadai;
-use App\Models\Customer;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Http;
-use App\Models\CawanganLelong;
-use Illuminate\Support\Facades\Artisan;
-use DateTime;
 
 class WhatsappNotisLelongFasa2 implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, ResolvesJanaNotisJumlah, SerializesModels;
+
+    public $timeout = 600;
+
+    public $tries = 1;
 
     public $user_id;
+
     public $user_kodcaw;
+
     protected $lelong_id;
 
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
     public function __construct($user_id, $user_kodcaw, $lelong_id)
     {
         $this->user_id = $user_id;
         $this->user_kodcaw = $user_kodcaw;
         $this->lelong_id = $lelong_id;
+        $this->onQueue('default');
     }
 
-    /**
+    public function handle(WhatsAppCloudService $whatsapp)
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
     {
-        // $user =  Auth::user();
+        if (! $whatsapp->isEnabled()) {
-        $caw = Cawangan::where('caw_code', '=', $this->user_kodcaw)->first();
+            Log::warning('WhatsappNotisLelongFasa2 skipped: WhatsApp Cloud API not enabled.');
 
-        $currentdate = Carbon::now();
+            return;
+        }
 
-        $lel = Lelong::with('cawangan')->find($this->lelong_id);
+        $caw = Cawangan::where('caw_code', $this->user_kodcaw)->first();
-        // dd($lel->tarikh_lelong);
+        if (! $caw) {
+            Log::error('WhatsappNotisLelongFasa2: cawangan not found', ['kodcaw' => $this->user_kodcaw]);
 
-        $cawanganDetail = $lel->cawangan->find($caw->id);
+            return;
-        $lelong_id = $this->lelong_id;
+        }
-        $cawangan = Cawangan::with(["lelongBid" => function($q) use ($lelong_id){
+
-            $q->where('lelong_id', '=', $lelong_id)->select('id','caw_id','kodcaw','norujukan','pinjaman','bakiupah','hargaasas','nilaimarhun','cajlelong','baki','t_lelong');
+        $lel = Lelong::find($this->lelong_id);
-        }])
+        if (! $lel) {
-        ->where('caw_code','=',$cawanganDetail->caw_code)->first();
+            Log::error('WhatsappNotisLelongFasa2: lelong not found', ['lelong_id' => $this->lelong_id]);
-        $lelongbid_data_pluck_norujukan = $cawangan->lelongBid->pluck('norujukan')->toArray();
+
-        $gadai_all = Gadai::on($cawanganDetail->caw_code)->whereIn('gadai.norujukan', $lelongbid_data_pluck_norujukan)
+            return;
+        }
+
+        $arraynorujukan = LelongBid::where('lelong_id', $this->lelong_id)
+            ->where('kodcaw', $caw->caw_code)
+            ->pluck('norujukan');
+
+        $gadaiAll = Gadai::on($caw->caw_code)
+            ->whereIn('norujukan', $arraynorujukan)
             ->orderBy('nokp', 'asc')
-        ->orderBy('norujukan','ASC')
+            ->orderBy('norujukan', 'asc')
             ->get();
 
-        $customers_list = $gadai_all->pluck('nokp')->unique();
+        $customers = Customer::whereIn('kpbaru', $gadaiAll->pluck('nokp'))
-        $customers = Customer::whereIn('kpbaru', $customers_list)
+            ->orWhereIn('kplama', $gadaiAll->pluck('nokp'))
-        ->orWhereIn('kplama', $customers_list)
             ->select('id', 'kpbaru', 'kplama', 'nama', 'telefon')
-        ->get()->keyBy('id');
+            ->get();
 
-        $customers_keyBy_noKp = $customers->keyBy(function ($item) {
+        $customersByKp = $customers->keyBy(function ($item) {
             if ($item->kpbaru != '') {
                 return $item->kpbaru;
-            } else if ($item->kplama != '') {
+            }
+            if ($item->kplama != '') {
                 return $item->kplama;
             }
         });
 
-        $customers_pluck_notel = $customers_keyBy_noKp->pluck('telefon');
+        $tarikhLelong = Carbon::parse($lel->tarikh_lelong)->format('d-m-Y');
-        // dd($customers_pluck_notel);
+        $tarikhSebelum = Carbon::parse($lel->tarikh_lelong)->subDays(3)->format('d-m-Y');
-        foreach($customers_pluck_notel as $index1 =>$custphone) {
+        $template = config('whatsapp.jana_notis_template');
-            // dd($custphone);
+        $lang = config('whatsapp.jana_notis_template_lang');
-            $special = preg_match('/[\'^£$%&*()}{@#~?><>,|=_+¬-]/', $custphone);
-                // dump($special);
-                if($special == 0){
-                    if($custphone == ''){
-                        $newtel = '';
-                    }elseif($custphone <> ''){
-                        $newtel = '6'.$custphone;
-                    }
-                }
-                elseif($special == 1){
-                    if($custphone == ''){
-                        $newtel = '';
-                    }elseif($custphone <> ''){
-                    $newtel = '6'.str_replace( array( '-' ), '', $custphone);
-                    }
-                }
-                // dump($newtel);
 
-        }
+        foreach ($gadaiAll as $suratnotis) {
-        $lelong_bid_all_groupby_norujukan = $cawangan->lelongBid->groupBy('norujukan');
+            if (! isset($customersByKp[$suratnotis->nokp])) {
-        $lelong_all_keyBy_norujukan = $gadai_all->keyBy('norujukan');
+                continue;
-        foreach($lelong_bid_all_groupby_norujukan as $index7=>$lelongbid){
-            // dd($notis_all_keyBy_norujukan);
-            if($lelong_all_keyBy_norujukan[$index7]){
-               
-                $gadai_true = $lelong_all_keyBy_norujukan[$index7];
-                $gadai_true['data_lelongbid'] = $lelongbid;
             }
 
-        }
+            $customer = $customersByKp[$suratnotis->nokp];
-        // dd($gadai_all);
+            $recipient = $whatsapp->resolveRecipient($customer->telefon);
-        foreach ($gadai_all as $index => $suratnotis) {
+            if (! $recipient) {
-            $datanotisbid = $suratnotis['data_lelongbid'][0]->fasa;
+                Log::warning('WhatsappNotisLelongFasa2: invalid phone', [
-            // dd($suratnotis);
+                    'nokp' => $suratnotis->nokp,
-            if($customers_keyBy_noKp[$suratnotis->nokp])
+                    'norujukan' => $suratnotis->norujukan,
-            {
-                $mobile_no = '60178916936';
-                // $mobile_no = $newtel;
-                $user_true = $customers_keyBy_noKp[$suratnotis->nokp];
-                $nama = $user_true->nama;
-                $t_lelong = Carbon::parse($lel->tarikh_lelong);
-                $t_lelongf1 = $t_lelong->format('d-m-Y');
-                $cawname = $caw->caw_name;
-                $para2blast = $caw->para3blast;
-                $myDateTime = DateTime::createFromFormat('Y-m-d', $lel->tarikh_lelong );
-                $datez = $myDateTime->modify('-3 day')->format('d-m-Y');
-                // dd($t_matang1);
-                    $message = '*LELONGAN AWAM BARANG GADAIAN PADA '.$t_lelongf1.'*
-                 
-Nama: *'.$nama.'* 
-No.KP: *'.$suratnotis->nokp.'*'.'
-No.Rujukan: *'.$suratnotis->norujukan.'* 
-Cawangan: *'.$cawname.'*
-Waktu Lelong: *10.30Pagi*
-
-Tuan/Puan adalah dikehendaki untuk membuat urusan berikut dikaunter cawangan pada atau sebelum *'.$datez.'*:-
-
-'.$para2blast.'.
-
-Terima Kasih';
-
-                if(config('app.env') != 'production'){
-                    $mobile_no = config('app.admin_phone_number');
-                }
-                $response = Http::get(config('app.wabot_api'), [
-                    'number' => $mobile_no,
-                    'type' => 'text',
-                    'message' =>  $message,
-                    'instance_id' => config('app.wabot_instances_id'),
-                    'access_token' => config('app.wabot_token_keys')
                 ]);
 
-                Log::info("WABOT - Notis Lelongan Fasa 2" . $response);
+                continue;
             }
-            sleep(2);
+
+            $jumlah = $this->resolveJanaNotisJumlah($caw->caw_code, $this->lelong_id, $suratnotis);
+            if ($jumlah === null) {
+                Log::warning('WhatsappNotisLelongFasa2: skip send, jumlah unavailable', [
+                    'norujukan' => $suratnotis->norujukan,
+                ]);
+
+                continue;
+            }
+
+            if (empty($caw->notel)) {
+                Log::warning('WhatsappNotisLelongFasa2: skip send, cawangan phone missing', [
+                    'kodcaw' => $caw->caw_code,
+                    'norujukan' => $suratnotis->norujukan,
+                ]);
+
+                continue;
+            }
+
+            // {{1}} nama, {{2}} norujukan, {{3}} jumlah, {{4}} tarikh lelong,
+            // {{5}} tarikh akhir bayaran, {{6}} telefon cawangan, {{7}} cawangan
+            $bodyParams = [
+                $customer->nama,
+                $suratnotis->norujukan,
+                $jumlah,
+                $tarikhLelong,
+                $tarikhSebelum,
+                $caw->notel,
+                $caw->caw_name,
+            ];
+
+            $whatsapp->sendTemplate($recipient, $template, $bodyParams, $lang);
+
+            usleep(300000);
         }
     }
 }

app/Jobs/WhatsappNotisPeringatanKedua.php

@@ -2,31 +2,30 @@
 
 namespace App\Jobs;
 
+use App\Models\Cawangan;
+use App\Models\Customer;
+use App\Models\Gadai;
+use App\Models\Notis;
+use App\Models\NotisBid;
+use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-
-use App\Models\Cawangan;
-use Carbon\Carbon;
-use App\Models\Notis;
-use App\Models\NotisBid;
-use App\Models\Gadai;
-use App\Models\Customer;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Http;
-use App\Models\CawanganNotis;
+use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Artisan;
 
 class WhatsappNotisPeringatanKedua implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public $user_id;
+
     public $user_kodcaw;
+
     protected $notisid;
+
     protected $cawid;
 
     /**
@@ -86,15 +85,14 @@ class WhatsappNotisPeringatanKedua implements ShouldQueue
             if ($special == 0) {
                 if ($custphone == '') {
                     $newtel = '';
-                    }elseif($custphone <> ''){
+                } elseif ($custphone != '') {
                     $newtel = '6'.$custphone;
                 }
-                }
+            } elseif ($special == 1) {
-                elseif($special == 1){
                 if ($custphone == '') {
                     $newtel = '';
-                    }elseif($custphone <> ''){
+                } elseif ($custphone != '') {
-                    $newtel = '6'.str_replace( array( '-' ), '', $custphone);
+                    $newtel = '6'.str_replace(['-'], '', $custphone);
                 }
             }
             // dump($newtel);
@@ -115,8 +113,7 @@ class WhatsappNotisPeringatanKedua implements ShouldQueue
         foreach ($gadai_all as $index => $suratnotis) {
             $datanotisbid = $suratnotis['data_notisbid'][0]->fasa;
             // dd($suratnotis);
-            if($customers_keyBy_noKp[$suratnotis->nokp])
+            if ($customers_keyBy_noKp[$suratnotis->nokp]) {
-            {
                 $mobile_no = '60178916936';
                 // $mobile_no = $newtel;
                 $user_true = $customers_keyBy_noKp[$suratnotis->nokp];
@@ -140,8 +137,7 @@ Tempoh: *'.$suratnotis->tempoh.' bulan*
 
 Tuan/puan atau wakil adalah dikehendaki menebus/membayar *KOS KEUNTUNGAN* tersebut secepat mungkin. Jika pihak tuan/puan menghadapi sebarang masalah, sila hubungi kami sebagaimana alamat di dalam *Surat Akaun Gadaian* ATAU datang sendiri ke *'.$cawname.'* dengan membawa bersama salinan asal Surat Akaun Gadaian tuan/puan. 
 Sekian, terima kasih.';
-                }
+                } elseif ($datanotisbid == '2') {
-                else if( $datanotisbid == '2'){
                     $message = '*NOTIS PEMBERITAHUAN*
 
 Nama: *'.$nama.'* 
@@ -154,7 +150,6 @@ Tempoh: *'.$suratnotis->tempoh.' bulan*.
 Tuan/puan atau wakil adalah dikehendaki menebus/tukar surat di premis kami dengan kadar yang segera. Jika pihak tuan/puan menghadapi sebarang masalah, sila hubungi kami sebagaimana alamat di dalam *Surat Akaun Gadaian* ATAU datang sendiri ke *'.$cawname.'* dengan membawa bersama salinan asal Surat Akaun Gadaian tuan/puan. 
 Sekian, terima kasih.';
 
-                
                 }
                 if (config('app.env') != 'production') {
                     $mobile_no = config('app.admin_phone_number');
@@ -164,10 +159,10 @@ Sekian, terima kasih.';
                     'type' => 'text',
                     'message' => $message,
                     'instance_id' => config('app.wabot_instances_id'),
-                    'access_token' => config('app.wabot_token_keys')
+                    'access_token' => config('app.wabot_token_keys'),
                 ]);
 
-                Log::info("WABOT - notis peringatan kedua " . $response);
+                Log::info('WABOT - notis peringatan kedua '.$response);
             }
             sleep(2);
         }

app/Jobs/WhatsappNotisTuntutBaki.php

@@ -2,32 +2,29 @@
 
 namespace App\Jobs;
 
+use App\Models\Cawangan;
+use App\Models\Customer;
+use App\Models\Lelong;
+use App\Models\LelongCawangan;
+use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-
-use App\Models\Cawangan;
-use Carbon\Carbon;
-use App\Models\Lelong;
-use App\Models\LelongCawangan;
-use App\Models\LelongBid;
-use App\Models\Gadai;
-use App\Models\Customer;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Http;
-use App\Models\CawanganLelong;
+use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Artisan;
 
 class WhatsappNotisTuntutBaki implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public $user_id;
+
     public $user_kodcaw;
+
     protected $lelong_id;
+
     protected $caw_id;
 
     /**
@@ -59,7 +56,7 @@ class WhatsappNotisTuntutBaki implements ShouldQueue
 
         $cawanganDetail = $lel->cawangan->find($this->caw_id);
         $lelong_id = $this->lelong_id;
-        $cawangan = Cawangan::with(["lelongBid" => function($q) use ($lelong_id){
+        $cawangan = Cawangan::with(['lelongBid' => function ($q) use ($lelong_id) {
             $q->where('lelong_id', '=', $lelong_id)->select('id', 'caw_id', 'kodcaw', 'norujukan', 'pinjaman', 'bakiupah', 'hargaasas', 'nilaimarhun', 'cajlelong', 'baki');
         }])
             ->where('caw_code', '=', $cawanganDetail->caw_code)->first();
@@ -96,15 +93,14 @@ class WhatsappNotisTuntutBaki implements ShouldQueue
             if ($special == 0) {
                 if ($custphone == '') {
                     $newtel = '';
-                    }elseif($custphone <> ''){
+                } elseif ($custphone != '') {
                     $newtel = '6'.$custphone;
                 }
-                }
+            } elseif ($special == 1) {
-                elseif($special == 1){
                 if ($custphone == '') {
                     $newtel = '';
-                    }elseif($custphone <> ''){
+                } elseif ($custphone != '') {
-                    $newtel = '6'.str_replace( array( '-' ), '', $custphone);
+                    $newtel = '6'.str_replace(['-'], '', $custphone);
                 }
             }
             // dump($newtel);
@@ -125,8 +121,7 @@ class WhatsappNotisTuntutBaki implements ShouldQueue
         foreach ($gadai_all as $index => $suratnotis) {
             $datanotisbid = $suratnotis['data_lelongbid'][0]->fasa;
             // dd($suratnotis);
-            if($customers_keyBy_noKp[$suratnotis->nokp])
+            if ($customers_keyBy_noKp[$suratnotis->nokp]) {
-            {
                 $mobile_no = '60178916936';
                 // $mobile_no = $newtel;
                 $user_true = $customers_keyBy_noKp[$suratnotis->nokp];
@@ -157,10 +152,10 @@ Terima Kasih';
                     'type' => 'text',
                     'message' => $message,
                     'instance_id' => config('app.wabot_instances_id'),
-                    'access_token' => config('app.wabot_token_keys')
+                    'access_token' => config('app.wabot_token_keys'),
                 ]);
 
-                Log::info("WABOT - Notis Tuntutan Baki Lelong" . $response);
+                Log::info('WABOT - Notis Tuntutan Baki Lelong'.$response);
             }
             sleep(2);
         }

app/Jobs/WhatsappPembidaFPXPaid.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
-use Carbon\Carbon;
-use App\Models\User;
-use App\Models\LogUser;
-
-class WhatsappPembidaFPXPaid implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public $userId, $resitId, $amount;
-
-    public function __construct($userId, $resitId, $amount)
-    {
-        $this->userId = $userId;
-        $this->resitId = $resitId;
-        $this->amount = $amount;
-    }
-
-    public function handle(): void
-    {
-        $dt = Carbon::now();
-        $user = User::find($this->userId);
-        if (!$user || !$user->notelbimbit) return;
-
-        $message = "Assalamualaikum {$user->name}, bayaran FPX anda sebanyak RM " . number_format($this->amount, 2) . " telah berjaya direkodkan. Resit ID: {$this->resitId}. Terima kasih.";
-
-        $mobile_no = '6' . $user->notelbimbit;
-        if (config('app.env') != 'production') {
-            $mobile_no = config('app.admin_phone_number');
-        }
-
-        $response = Http::get(config('app.wabot_api'), [
-            'number' => $mobile_no,
-            'type' => 'text',
-            'message' => $message,
-            'instance_id' => config('app.wabot_instances_id'),
-            'access_token' => config('app.wabot_token_keys')
-        ]);
-
-        $loguser = new LogUser;
-        $loguser->date = $dt;
-        $loguser->username = 'Operasi';
-        $loguser->nama_user = 'System';
-        $loguser->nota = 'Notifikasi Pembayaran Billplz Berjaya';
-        $loguser->save();
-
-        Log::info("Notifikasi Pembayaran Billplz Berjaya: " . $response);
-    }
-}

app/Jobs/WhatsappPemenang.php

@@ -2,66 +2,52 @@
 
 namespace App\Jobs;
 
+use App\Services\WhatsAppCloudService;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-
-use App\Models\Cawangan;
-use Carbon\Carbon;
-use App\Models\Notis;
-use App\Models\NotisBid;
-use App\Models\Gadai;
-use App\Models\Customer;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Http;
-use App\Models\CawanganNotis;
-use Illuminate\Support\Facades\Artisan;
 
 class WhatsappPemenang implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public $user_notelbimbit;
-    public $total_bid_win_converted;
-    // protected $notisid;
-    // protected $cawid;
 
-    /**
+    public $total_bid_win_converted;
-     * Create a new job instance.
+
-     *
-     * @return void
-     */
     public function __construct($user_notelbimbit, $total_bid_win_converted)
     {
         $this->user_notelbimbit = $user_notelbimbit;
         $this->total_bid_win_converted = $total_bid_win_converted;
-        // $this->notisid = $notisid;
+        $this->onQueue('default');
-        // $this->cawid = $cawid;
     }
 
-    /**
+    public function handle(WhatsAppCloudService $whatsapp)
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
     {
-        $mobile_no = ltrim($this->user_notelbimbit, '+');
+        if (! $whatsapp->isEnabled()) {
-        $message = 'AR-RAHN PKB: Tahniah Anda Menang Bidaan Sebanyak RM' .  $this->total_bid_win_converted . '. Sila Semak Melalui Sistem ArrahnBid. Terima Kasih.';
+            Log::warning('WhatsappPemenang skipped: WhatsApp Cloud API not enabled.');
-        if(config('app.env') != 'production'){
+
-            $mobile_no = config('app.admin_phone_number');
+            return;
         }
-        $response = Http::get(config('app.wabot_api'), [
+
-            'number' => $mobile_no,
+        $recipient = $whatsapp->resolveRecipient($this->user_notelbimbit);
-            'type' => 'text',
+        if (! $recipient) {
-            'message' =>  $message,
+            Log::warning('WhatsappPemenang: invalid phone', [
-            'instance_id' => config('app.wabot_instances_id'),
+                'notelbimbit' => $this->user_notelbimbit,
-            'access_token' => config('app.wabot_token_keys')
             ]);
 
-        Log::info("WABOT - menang bidaan " . $response);
+            return;
+        }
+
+        // {{1}} jumlah bidaan menang (formatted, without RM)
+        $whatsapp->sendTemplate(
+            $recipient,
+            config('whatsapp.pemenang_template'),
+            [$this->total_bid_win_converted],
+            config('whatsapp.pemenang_template_lang')
+        );
     }
 }

app/Jobs/WhatsappPengesahanPembida.php

@@ -1,63 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-use App\Models\Cawangan;
-use Carbon\Carbon;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Artisan;
-
-class WhatsappPengesahanPembida implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public $user_notelbimbit;
-    public $user_namapembida;
-    public $user_cawname;
-
-    // protected $notisid;
-    // protected $cawid;
-    
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-    public function __construct($user_notelbimbit,$user_namapembida,$user_cawname)
-    {
-        $this->user_notelbimbit = $user_notelbimbit;
-        $this->user_namapembida = $user_namapembida;
-        $this->user_cawname = $user_cawname;
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        $mobile_no = ltrim($this->user_notelbimbit, '+');
-        $message = 'AR-RAHN PKB: Terima Kasih '.$this->user_namapembida .', Pembayaran Bidaan Anda Untuk Cawangan *'.$this->user_cawname.'* Telah Disahkan, Sila Ke Cawangan Berkenaan Untuk Tuntutan Barang Bidaan Anda Hari Ini.';
-        if(config('app.env') != 'production'){
-            $mobile_no = config('app.admin_phone_number');
-        }
-        $response = Http::get(config('app.wabot_api'), [
-            'number' => $mobile_no,
-            'type' => 'text',
-            'message' =>  $message,
-            'instance_id' => config('app.wabot_instances_id'),
-            'access_token' => config('app.wabot_token_keys')
-        ]);
-
-        Log::info("WABOT - Akaun Telah Sahkan Pembayaran: ".$this->user_namapembida .'' . $response);
-    }
-}

app/Jobs/WhatsappTidakSahBayaran.php

@@ -2,19 +2,14 @@
 
 namespace App\Jobs;
 
+use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-
-use App\Models\LogUser;
-use App\Models\User;
 use Illuminate\Support\Facades\Http;
 
-
-
 class WhatsappTidakSahBayaran implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
@@ -50,9 +45,8 @@ class WhatsappTidakSahBayaran implements ShouldQueue
                 'type' => 'text',
                 'message' => 'Bayaran Pembida yang bernama *'.$this->user_namapembida.'* Adalah *Tidak Sah*, Mohon Pihak AJK Lelong Untuk Buat Semakan, Terima Kasih.',
                 'instance_id' => config('app.wabot_instances_id'),
-                    'access_token' => config('app.wabot_token_keys')
+                'access_token' => config('app.wabot_token_keys'),
             ]);
         }
     }
 }
-

app/Mail/NotifyAdmin.php

@@ -3,7 +3,6 @@
 namespace App\Mail;
 
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
 
@@ -30,7 +29,7 @@ class NotifyAdmin extends Mailable
      */
     public function build()
     {
-        return $this->from("masterlelongpkb@gmail.com", "Admin ArrahnBid")
+        return $this->from('masterlelongpkb@gmail.com', 'Admin ArrahnBid')
             ->subject('ArrahnBid - '.$this->content_collection['description'])
             ->view('template.notifyadmin', ['content_collection' => $this->content_collection]);
     }

app/Mail/Pemenang.php

@@ -2,12 +2,11 @@
 
 namespace App\Mail;
 
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Mail\Mailable;
-use Illuminate\Queue\SerializesModels;
 use App\Models\LelongBidder;
 use Carbon\Carbon;
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
 
 class Pemenang extends Mailable
 {
@@ -18,8 +17,8 @@ class Pemenang extends Mailable
      *
      * @return void
      */
-
     public $name;
+
     public $total_bid_win;
     // public $id;
     // public $lelong_id;
@@ -65,7 +64,7 @@ class Pemenang extends Mailable
 
         // $infos[$index1]['info'] = $info;
 
-        return $this->from("masterlelongpkb@gmail.com", "Admin ArrahnBid")
+        return $this->from('masterlelongpkb@gmail.com', 'Admin ArrahnBid')
             ->subject('ArrahnBid -Tahniah,Anda Pemenang ArrahnBid')
             ->view('template.pemenang', ['user' => $user]);
     }

app/Mail/ResetPassword.php

@@ -3,7 +3,6 @@
 namespace App\Mail;
 
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
 
@@ -11,32 +10,22 @@ class ResetPassword extends Mailable
 {
     use Queueable, SerializesModels;
 
-    /**
-     * Create a new message instance.
-     *
-     * @return void
-     */
-
     public $name;
-    public $token;
 
-    public function __construct($name, $token)
+    public $resetUrl;
+
+    public function __construct($name, $resetUrl)
     {
         $this->name = $name;
-        $this->token = $token;
+        $this->resetUrl = $resetUrl;
     }
 
-    /**
-     * Build the message.
-     *git stsa
-     */
     public function build()
     {
-        // return $this->view('view.name');
         $user['name'] = $this->name;
-        $user['token'] = $this->token;
+        $user['reset_url'] = $this->resetUrl;
 
-        return $this->from("masterlelongpkb@gmail.com", "Admin ArrahnBid")
+        return $this->from(config('mail.from.address'), config('mail.from.name'))
             ->subject('ArrahnBid - Tukar Katalaluan')
             ->view('template.reset-password', ['user' => $user]);
     }

app/Mail/VerifyEmail.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+
+class VerifyEmail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    public $name;
+    public $verifyUrl;
+
+    public function __construct($name, $verifyUrl)
+    {
+        $this->name = $name;
+        $this->verifyUrl = $verifyUrl;
+    }
+
+    public function build()
+    {
+        $user['name'] = $this->name;
+        $user['verify_url'] = $this->verifyUrl;
+
+        return $this->from(config('mail.from.address'), config('mail.from.name'))
+            ->subject('ArrahnBid - Pengesahan Emel')
+            ->view('template.verify-email', ['user' => $user]);
+    }
+}

app/Mail/notislelong.php

@@ -3,7 +3,6 @@
 namespace App\Mail;
 
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
 
@@ -12,6 +11,7 @@ class notislelong extends Mailable
     use Queueable, SerializesModels;
 
     public $mailData;
+
     /**
      * Create a new message instance.
      *

app/Models/Bulan.php

@@ -8,6 +8,7 @@ use Illuminate\Database\Eloquent\Model;
 class Bulan extends Model
 {
     use HasFactory;
+
     protected $table = 'bulan';
 
     protected $fillable = [

app/Models/Cart.php

@@ -12,7 +12,6 @@ class Cart extends Model
     protected $table = 'carts';
 
     protected $fillable = [
-        'hargabida'
+        'hargabida',
     ];
-
 }

app/Models/Cawangan.php

@@ -29,7 +29,7 @@ class Cawangan extends Model
         'pkb_jmc',
         'para2',
         'para3',
-        'tagujrah'
+        'tagujrah',
     ];
 
     public function simulasi()

app/Models/CawanganKpi.php

@@ -8,6 +8,7 @@ use Illuminate\Database\Eloquent\Model;
 class CawanganKpi extends Model
 {
     use HasFactory;
+
     protected $table = 'cawangan_kpi';
 
     protected $fillable = [
@@ -20,6 +21,7 @@ class CawanganKpi extends Model
     {
         return $this->belongsTo(Cawangan::class, 'caw_id', 'id');
     }
+
     public function dataKpi()
     {
         return $this->hasMany(DataKpi::class, 'namastaff', 'namastaff');

app/Models/CawanganLelong.php

@@ -21,7 +21,7 @@ class CawanganLelong extends Model
         'import_data_sts',
         'export_data_stsdate',
         'import_data_stsdate',
-        'lokasi'
+        'lokasi',
     ];
 
     public function lelongBid()

app/Models/CawanganNotis.php

@@ -16,7 +16,7 @@ class CawanganNotis extends Model
         'notis_id',
         'caw_id',
         'fasa',
-        'status'
+        'status',
     ];
 
     // public function lelongBid()
@@ -34,5 +34,3 @@ class CawanganNotis extends Model
         return $this->belongsTo(Notis::class, 'notis_id', 'id');
     }
 }
-
-

app/Models/CawanganSimulasi.php

@@ -17,7 +17,7 @@ class CawanganSimulasi extends Model
         'import_data_sts',
         'export_data_stsdate',
         'import_data_stsdate',
-        'lokasi'
+        'lokasi',
     ];
 
     // function below to delete
@@ -35,5 +35,4 @@ class CawanganSimulasi extends Model
     {
         return SimulasiBid::where('simulasi_id', $this->simulasi_id)->where('caw_id', $this->caw_id)->get();
     }
-
 }