Merge staging into master #4

Merged
fajri merged 8 commits from staging into master 2026-06-25 16:09:56 +07:00
Showing only changes of commit 2716f15cbe - Show all commits

View File

@@ -32,9 +32,15 @@ module.exports = {
}
,computed: {
branch_name() {
let branch = this.$store.state.system.branch
if (branch.M_BranchName == undefined) return ''
return branch.M_BranchName
try {
let retrievedObject = localStorage.getItem("user")
if (!retrievedObject) return ''
let dtuser = JSON.parse(retrievedObject)
if (dtuser.M_BranchName == undefined) return ''
return dtuser.M_BranchName
} catch(e) {
return ''
}
},
f_tanggal() {
try {