Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix logout issue #1153

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+58 −260
Open

Fix logout issue #1153

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba298cd
fix Logout issue
radhika587 Mar 10, 2023
bdf8fa8
fix logout issue on payment and recurring-invoice view page
radhika587 Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix Logout issue
  • Loading branch information
@radhika587
radhika587 committed Mar 10, 2023
commit ba298cdb0a6febe8129b51910cea0928d7ccd4db
19 changes: 6 additions & 13 deletions resources/scripts/admin/views/customers/partials/CustomerChart.vue
View file
Original file line number Diff line number Diff line change
@@ -35,16 +35,7 @@
</div>

<div
class="
grid
col-span-12
mt-6
text-center
xl:mt-0
sm:grid-cols-4
xl:text-right xl:col-span-3 xl:grid-cols-1
xxl:col-span-2
"
class="grid col-span-12 mt-6 text-center xl:mt-0 sm:grid-cols-4 xl:text-right xl:col-span-3 xl:grid-cols-1 xxl:col-span-2"
>
<div class="px-6 py-2">
<span class="text-xs leading-5 lg:text-sm">
@@ -177,10 +168,12 @@ const getChartInvoices = computed(() => {
return []
})

const customerId = computed(() => route.params.id)

watch(
route,
() => {
if (route.params.id) {
() => customerId.value,
(id) => {
if (id && route.name === 'customers.view') {
loadCustomer()
}
selectedYear.value = 'This year'
102 changes: 16 additions & 86 deletions resources/scripts/admin/views/estimates/View.vue
View file
Original file line number Diff line number Diff line change
@@ -37,32 +37,10 @@

<!-- Sidebar -->
<div
class="
fixed
top-0
left-0
hidden
h-full
pt-16
pb-[6.4rem]
ml-56
bg-white
xl:ml-64
w-88
xl:block
"
class="fixed top-0 left-0 hidden h-full pt-16 pb-[6.4rem] ml-56 bg-white xl:ml-64 w-88 xl:block"
>
<div
class="
flex
items-center
justify-between
px-4
pt-8
pb-2
border border-gray-200 border-solid
height-full
"
class="flex items-center justify-between px-4 pt-8 pb-2 border border-gray-200 border-solid height-full"
>
<div class="mb-6">
<BaseInput
@@ -92,14 +70,7 @@
</template>

<div
class="
px-4
py-1
pb-2
mb-1 mb-2
text-sm
border-b border-gray-200 border-solid
"
class="px-4 py-1 pb-2 mb-1 mb-2 text-sm border-b border-gray-200 border-solid"
>
{{ $t('general.sort_by') }}
</div>
@@ -156,12 +127,7 @@

<div
ref="estimateListSection"
class="
h-full
overflow-y-scroll
border-l border-gray-200 border-solid
base-scroll
"
class="h-full overflow-y-scroll border-l border-gray-200 border-solid base-scroll"
>
<div v-for="(estimate, index) in estimateList" :key="index">
<router-link
@@ -181,29 +147,11 @@
<BaseText
:text="estimate.customer.name"
:length="30"
class="
pr-2
mb-2
text-sm
not-italic
font-normal
leading-5
text-black
capitalize
truncate
"
class="pr-2 mb-2 text-sm not-italic font-normal leading-5 text-black capitalize truncate"
/>

<div
class="
mt-1
mb-2
text-xs
not-italic
font-medium
leading-5
text-gray-600
"
class="mt-1 mb-2 text-xs not-italic font-medium leading-5 text-gray-600"
>
{{ estimate.estimate_number }}
</div>
@@ -220,26 +168,11 @@
<BaseFormatMoney
:amount="estimate.total"
:currency="estimate.customer.currency"
class="
block
mb-2
text-xl
not-italic
font-semibold
leading-8
text-right text-gray-900
"
class="block mb-2 text-xl not-italic font-semibold leading-8 text-right text-gray-900"
/>

<div
class="
text-sm
not-italic
font-normal
leading-5
text-right text-gray-600
est-date
"
class="text-sm not-italic font-normal leading-5 text-right text-gray-600 est-date"
>
{{ estimate.formatted_estimate_date }}
</div>
@@ -264,13 +197,7 @@
>
<iframe
:src="`${shareableLink}`"
class="
flex-1
border border-gray-400 border-solid
rounded-md
bg-white
frame-style
"
class="flex-1 border border-gray-400 border-solid rounded-md bg-white frame-style"
/>
</div>
</BasePage>
@@ -345,11 +272,14 @@ const getCurrentEstimateId = computed(() => {
return null
})

watch(route, (to, from) => {
if (to.name === 'estimates.view') {
loadEstimate()
const estimateId = computed(() => route.params.id)

watch(
() => estimateId.value,
(id) => {
if (id && route.name === 'estimates.view') loadEstimate()
}
})
)

loadEstimates()
loadEstimate()
102 changes: 16 additions & 86 deletions resources/scripts/admin/views/invoices/View.vue
View file
Original file line number Diff line number Diff line change
@@ -65,11 +65,14 @@ const getCurrentInvoiceId = computed(() => {
return null
})

watch(route, (to, from) => {
if (to.name === 'invoices.view') {
loadInvoice()
const invoiceId = computed(() => route.params.id)

watch(
() => invoiceId.value,
(id) => {
if (id && route.name === 'invoices.view') loadInvoice()
}
})
)

async function onMarkAsSent() {
dialogStore
@@ -286,32 +289,10 @@ onSearched = debounce(onSearched, 500)

<!-- sidebar -->
<div
class="
fixed
top-0
left-0
hidden
h-full
pt-16
pb-[6.4rem]
ml-56
bg-white
xl:ml-64
w-88
xl:block
"
class="fixed top-0 left-0 hidden h-full pt-16 pb-[6.4rem] ml-56 bg-white xl:ml-64 w-88 xl:block"
>
<div
class="
flex
items-center
justify-between
px-4
pt-8
pb-2
border border-gray-200 border-solid
height-full
"
class="flex items-center justify-between px-4 pt-8 pb-2 border border-gray-200 border-solid height-full"
>
<div class="mb-6">
<BaseInput
@@ -335,14 +316,7 @@ onSearched = debounce(onSearched, 500)
</BaseButton>
</template>
<div
class="
px-2
py-1
pb-2
mb-1 mb-2
text-sm
border-b border-gray-200 border-solid
"
class="px-2 py-1 pb-2 mb-1 mb-2 text-sm border-b border-gray-200 border-solid"
>
{{ $t('general.sort_by') }}
</div>
@@ -399,12 +373,7 @@ onSearched = debounce(onSearched, 500)

<div
ref="invoiceListSection"
class="
h-full
overflow-y-scroll
border-l border-gray-200 border-solid
base-scroll
"
class="h-full overflow-y-scroll border-l border-gray-200 border-solid base-scroll"
>
<div v-for="(invoice, index) in invoiceList" :key="index">
<router-link
@@ -424,29 +393,11 @@ onSearched = debounce(onSearched, 500)
<BaseText
:text="invoice.customer.name"
:length="30"
class="
pr-2
mb-2
text-sm
not-italic
font-normal
leading-5
text-black
capitalize
truncate
"
class="pr-2 mb-2 text-sm not-italic font-normal leading-5 text-black capitalize truncate"
/>

<div
class="
mt-1
mb-2
text-xs
not-italic
font-medium
leading-5
text-gray-600
"
class="mt-1 mb-2 text-xs not-italic font-medium leading-5 text-gray-600"
>
{{ invoice.invoice_number }}
</div>
@@ -460,27 +411,12 @@ onSearched = debounce(onSearched, 500)

<div class="flex-1 whitespace-nowrap right">
<BaseFormatMoney
class="
mb-2
text-xl
not-italic
font-semibold
leading-8
text-right text-gray-900
block
"
class="mb-2 text-xl not-italic font-semibold leading-8 text-right text-gray-900 block"
:amount="invoice.total"
:currency="invoice.customer.currency"
/>
<div
class="
text-sm
not-italic
font-normal
leading-5
text-right text-gray-600
est-date
"
class="text-sm not-italic font-normal leading-5 text-right text-gray-600 est-date"
>
{{ invoice.formatted_invoice_date }}
</div>
@@ -505,13 +441,7 @@ onSearched = debounce(onSearched, 500)
>
<iframe
:src="`${shareableLink}`"
class="
flex-1
border border-gray-400 border-solid
bg-white
rounded-md
frame-style
"
class="flex-1 border border-gray-400 border-solid bg-white rounded-md frame-style"
/>
</div>
</BasePage>