PatAlcala9/ocbo-esign
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: PatAlcala9:bbca186ab918362027d16a7bc2603bb5ef7f6cdd
Branches Tags
PatAlcala9:main
..
compare: PatAlcala9:4eb6b7083085eb139746dc8e3f7144ac7c910345
Branches Tags
PatAlcala9:main

No commits in common. "bbca186ab918362027d16a7bc2603bb5ef7f6cdd" and "4eb6b7083085eb139746dc8e3f7144ac7c910345" have entirely different histories.
bbca186ab9 ... 4eb6b70830

3 changed files with 17 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

65
backend/main.go
View file

@ -46,14 +46,6 @@ func getCORSConfig(env string) cors.Config {
ExposeHeaders: []string{"Content-Length"},
AllowCredentials: true,
}
case "lan":
return cors.Config{
AllowOrigins: []string{"*"},
AllowMethods: []string{"GET", "POST", "OPTIONS", "DELETE"},
AllowHeaders: []string{"*"},
ExposeHeaders: []string{"Content-Length"},
AllowCredentials: true,
}
default:
return cors.DefaultConfig()
}
@ -1474,19 +1466,6 @@ func connect() {
"result2": resultCount,
})
case "login":
var resultInt, resultCount int
err := dbpop.QueryRow(`SELECT COUNT(OrderPayId) AS resultInt, COUNT(AFNum) AS resultCount FROM orderpaydetail WHERE oprefid = ?`, data).Scan(&resultInt, &resultCount)
if err != nil {
c.AbortWithError(http.StatusBadRequest, err)
c.String(http.StatusBadRequest, err.Error())
return
}
c.JSON(http.StatusOK, gin.H{
"result": resultInt,
"result2": resultCount,
})
}
})
@ -2356,50 +2335,6 @@ func connect() {
}
})
router.POST("/api/update-opforapproval-electrical", func(c *gin.Context) {
type forApprovalData struct {
Data string `json:"data"` //electricalNo
}
var forapprovalData forApprovalData
if err := c.ShouldBindJSON(&forapprovalData); err != nil {
c.String(http.StatusBadRequest, "Invalid request body")
return
}
c.Writer.Header().Set("X-XSS-Protection", "1; mode=block")
c.Writer.Header().Set("X-Content-Type-Options", "nosniff")
c.Writer.Header().Set("X-DNS-Prefetch-Control", "off")
c.Writer.Header().Set("X-Frame-Options", "DENY")
c.Writer.Header().Set("X-Download-Options", "noopen")
c.Writer.Header().Set("Referrer-Policy", "no-referrer")
c.Writer.Header().Set("Content-Security-Policy", "default-src 'self'; img-src 'self';")
c.Writer.Header().Set("X-Server", "OCBO Server")
dbpost, err := db.Prepare("UPDATE electrical_orderofpayment_new SET is_approve = 0, is_release = 0, popstransmitted = 0 WHERE is_paid = 0 AND electricalid = (SELECT electricalid FROM electrical WHERE electricalNo = ?)")
if err != nil {
c.AbortWithError(http.StatusInternalServerError, err)
c.String(http.StatusInternalServerError, "Internal Server Error")
return
}
defer dbpost.Close()
exec, err := dbpost.Exec(forapprovalData.Data)
if err != nil {
panic(err.Error())
}
affect, err := exec.RowsAffected()
if err != nil {
panic(err.Error())
}
if affect > 0 {
c.String(http.StatusOK, "Success on Updating Re-Approval")
} else {
c.String(http.StatusInternalServerError, "Failed on Updating Re-Approval")
}
})
// router.POST("/api/return-approval-electrical", middleware.TokenChecker(), func(c *gin.Context) {
// type returnApprovalData struct {
// Data string `json:"data"` //electricalNo

54
src/pages/AssessorPage/Assessor.tsx
View file

@ -32,12 +32,11 @@ import {
_type,
_units,
} from '../../stores/pdfinfo.ts'
import { checkConnection, createPdfElectrical, createPdfOccupancy, deleteApi, getApi, getApiMulti, getDateTime, postApi, saveNewName, saveNewPassword, securePassword, statusPopsApi, voidPopsApi } from '../../utils/functions/index.ts'
import { checkConnection, createPdfElectrical, createPdfOccupancy, getApi, getApiMulti, getDateTime, postApi, saveNewName, saveNewPassword, securePassword, statusPopsApi, voidPopsApi } from '../../utils/functions/index.ts'
import { AiOutlineLoading3Quarters } from 'solid-icons/ai'
import './Assessor.sass'
const PESO = import.meta.env.VITE_PESO
const BACKEND = import.meta.env.VITE_BACKEND
export default () => {
const navigate = useNavigate()
@ -349,9 +348,6 @@ export default () => {
}
const rePrintHandler = async (division: string, application: string) => {
let popsExist: boolean = false
let popsPaid: boolean = false
setConnected(await checkConnection())
if (connected() === false) {
setErrorMessage('No Connection on Server')
@ -359,46 +355,34 @@ export default () => {
}
if (selectedType().includes('Void')) {
// Return to APPROVAL
// Return to ASSESSMENT
// TODO:
// Set current status (for validation) to 1, is_approve = 1
// Clear order of payment as long as not Paid
// Clear esign_transactions
if (BACKEND.includes('localhost')) {
const status = await checkStatusPopsLocal(application)
console.log('status', status)
if (status.result > 0) popsExist = true
if (status.result2 > 0) popsPaid = true
} else {
const status = await await statusPopsOp(application)
if (status.message === 'Success') popsExist = true
if (status.pops_paid === true) popsPaid = true
}
const status = await statusPopsOp(application)
const message = status.message
// const status = await statusPopsOp(application)
// const message = status.message
if (!popsExist) {
if (message.includes('No record')) {
setVoidError(true)
setErrorMessage('No record found on Pops')
return
} else {
// const pops_paid = message.pops_paid
// const epay_paid = message.epay_paid
}
const pops_paid = message.pops_paid
const epay_paid = message.epay_paid
if (popsPaid) {
setVoidError(true)
setErrorMessage('Already Paid')
return
if (pops_paid || epay_paid) {
setVoidError(true)
setErrorMessage('Already Paid')
return
}
}
if (division === 'electrical') {
await setNewStatus(division, 'ELECTRICAL ORDER OF PAYMENT VOIDED', '173', 'ELECOPVOIDED', 1)
await setNewStatus(division, 'FOR ELECTRICAL ORDER OF PAYMENT APPROVAL', '94', 'ELECOPAPPROVE', 0)
await updateDocflow(division, application, 'FOR ELECTRICAL ORDER OF PAYMENT PRINTING')
await updateOpForApproval(division, application)
await clearEsignTransactions(application)
} else if (division === 'occupancy') {
await setNewStatus(division, 'OCCUPANCY ORDER OF PAYMENT VOIDED', '174', 'OCCOPVOIDED', 1)
//UNFINISH
@ -530,7 +514,7 @@ export default () => {
}
const checkStatusPopsLocal = async (application: string) => {
const response = await getApiMulti('check-statuspops-local', application)
const response = await getApi('check-statuspops-local', application)
return response
}
@ -539,16 +523,6 @@ export default () => {
return response
}
const updateOpForApproval = async (division: string, application: string) => {
const response = await postApi(`update-opforapproval-${division}`, { data: application })
return response
}
const clearEsignTransactions = async (application: string) => {
const response = await deleteApi('delete-esigntransactions', { data: application })
return response
}
const saveConfig = async () => {
if (configNewName() !== '') await saveNewName(parseInt(employeeId().toString()), configNewName())
if (configNewPassword() !== '') await saveNewPassword(parseInt(employeeId().toString()), configNewEncPassword())

3
src/pages/MainPage/Main.tsx
View file

@ -172,6 +172,9 @@ export default () => {
setLoadingText('Processing Data')
if (division === 'electrical') {
// const isPaid = BACKEND.includes('localhost') ? await checkStatusPopsLocal(application) : await statusPopsOp(application)
// let isPaid
if (BACKEND.includes('localhost')) {
const status = await checkStatusPopsLocal(application)
if (status.result > 0) popsExist = true