-
+
+ id="notes" />
@@ -327,13 +251,9 @@
@@ -344,27 +264,14 @@
-
-
-
+
+
|
-
-
-
+
+
|
@@ -390,20 +297,11 @@
@@ -492,10 +390,7 @@ const invoiceData = reactive({
const invoiceItems = reactive([])
let invoiceDueDate = computed(() => {
if (invoiceData.invoice_terms) {
- let result = addDays(
- invoiceData.invoice_date,
- parseInvoiceTerms(invoiceData.invoice_terms),
- )
+ let result = addDays(invoiceData.invoice_date, parseInvoiceTerms(invoiceData.invoice_terms))
// return as string
return result.toISOString().split('T')[0]
}
@@ -513,7 +408,7 @@ const addRow = () => {
invoiceItems.push(rowObject)
}
-const deleteRow = (index) => {
+const deleteRow = index => {
invoiceItems.splice(index, 1)
}
@@ -535,7 +430,7 @@ const saveInvoice = () => {
state: invoiceData.state,
zip_code: invoiceData.zip_code,
notes: invoiceData.notes,
- supplier_invoice_items: invoiceItems.map((item) => {
+ supplier_invoice_items: invoiceItems.map(item => {
return {
service_type: item.service_type,
quantity: item.quantity,
@@ -554,11 +449,11 @@ portalSuppliers.fetch()
// watch for changes in invoiceData.supplier_name
watch(
() => invoiceData.supplier_name,
- (newVal) => {
+ newVal => {
if (newVal) {
invoiceData.supplier = newVal.value
}
- },
+ }
)
diff --git a/supplier-portal/src/pages/SupplierInvoice.vue b/supplier-portal/src/pages/SupplierInvoice.vue
index 8aaa007..89e15b1 100644
--- a/supplier-portal/src/pages/SupplierInvoice.vue
+++ b/supplier-portal/src/pages/SupplierInvoice.vue
@@ -22,35 +22,24 @@
-
+
-
+
+ :value="invoice.doc.supplier" />
-
+
+ v-model="invoice.doc.service_date" />
@@ -68,25 +56,20 @@
-
+
+ :value="invoice.doc.supplier_name" />
-
+
+ v-model="invoice.doc.invoice_date" />
@@ -114,8 +96,7 @@
placeholder="Due Date"
id="due_date"
:disabled="true"
- v-model="invoice.doc.due_date"
- />
+ v-model="invoice.doc.due_date" />
@@ -124,17 +105,14 @@
-
+
+ :value="invoice.doc.invoice_terms" />
@@ -150,85 +128,65 @@
data-bs-toggle="collapse"
data-bs-target="#collapseOne"
aria-expanded="true"
- aria-controls="collapseOne"
- >
+ aria-controls="collapseOne">
Service Address
-
+
-
+
+ :value="invoice.doc.site_code" />
-
+
+ :value="invoice.doc.street" />
-
+
+ :value="invoice.doc.city" />
-
+
+ :value="invoice.doc.state" />
-
+
+ :value="invoice.doc.zip_code" />
@@ -246,21 +204,14 @@
data-bs-toggle="collapse"
data-bs-target="#collapse-2"
aria-expanded="true"
- aria-controls="collapse-2"
- >
+ aria-controls="collapse-2">
Notes
-
+
-
+
+ id="notes" />
@@ -293,10 +243,7 @@
-
+
| {{ index + 1 }} |
{{ item.service_type }} |
{{ item.quantity }} |
@@ -312,20 +259,11 @@
diff --git a/supplier-portal/src/pages/SupplierInvoiceList.vue b/supplier-portal/src/pages/SupplierInvoiceList.vue
index 2093cb1..c69833e 100644
--- a/supplier-portal/src/pages/SupplierInvoiceList.vue
+++ b/supplier-portal/src/pages/SupplierInvoiceList.vue
@@ -16,13 +16,7 @@
-
+
diff --git a/supplier-portal/src/router.js b/supplier-portal/src/router.js
index 7a6587c..0ab5d26 100644
--- a/supplier-portal/src/router.js
+++ b/supplier-portal/src/router.js
@@ -3,49 +3,49 @@ import { session } from './data/session'
import { userResource } from '@/data/user'
const routes = [
- {
- name: 'Login',
- path: '/login',
- component: () => import('@/pages/Login.vue'),
- },
- {
- name: 'SupplierInvoiceList',
- path: '/',
- component: () => import('@/pages/SupplierInvoiceList.vue'),
- },
- {
- name: 'SupplierInvoice',
- path: '/invoices/:supplierInvoiceNumber',
- component: () => import('@/pages/SupplierInvoice.vue'),
- props: true,
- },
- {
- name: 'SupplierInvoiceCreate',
- path: '/invoices/new',
- component: () => import('@/pages/NewInvoice.vue'),
- },
+ {
+ name: 'Login',
+ path: '/login',
+ component: () => import('@/pages/Login.vue'),
+ },
+ {
+ name: 'SupplierInvoiceList',
+ path: '/',
+ component: () => import('@/pages/SupplierInvoiceList.vue'),
+ },
+ {
+ name: 'SupplierInvoice',
+ path: '/invoices/:supplierInvoiceNumber',
+ component: () => import('@/pages/SupplierInvoice.vue'),
+ props: true,
+ },
+ {
+ name: 'SupplierInvoiceCreate',
+ path: '/invoices/new',
+ component: () => import('@/pages/NewInvoice.vue'),
+ },
]
let router = createRouter({
- history: createWebHistory('/supplier-portal'),
- routes,
+ history: createWebHistory('/supplier-portal'),
+ routes,
})
router.beforeEach(async (to, from, next) => {
- let isLoggedIn = session.isLoggedIn
- try {
- await userResource.promise
- } catch (error) {
- isLoggedIn = false
- }
+ let isLoggedIn = session.isLoggedIn
+ try {
+ await userResource.promise
+ } catch (error) {
+ isLoggedIn = false
+ }
- if (to.name === 'Login' && isLoggedIn) {
- next({ name: 'SupplierInvoiceList' })
- } else if (to.name !== 'Login' && !isLoggedIn) {
- next({ name: 'Login' })
- } else {
- next()
- }
+ if (to.name === 'Login' && isLoggedIn) {
+ next({ name: 'SupplierInvoiceList' })
+ } else if (to.name !== 'Login' && !isLoggedIn) {
+ next({ name: 'Login' })
+ } else {
+ next()
+ }
})
-export default router
\ No newline at end of file
+export default router
diff --git a/supplier-portal/tailwind.config.js b/supplier-portal/tailwind.config.js
index ccf09b4..1daae2f 100644
--- a/supplier-portal/tailwind.config.js
+++ b/supplier-portal/tailwind.config.js
@@ -1,18 +1,16 @@
module.exports = {
- presets: [
- require('frappe-ui/src/utils/tailwind.config')
- ],
- content: [
- "./index.html",
- "./src/**/*.{vue,js,ts,jsx,tsx}",
- "./node_modules/frappe-ui/src/components/**/*.{vue,js,ts,jsx,tsx}",
- ],
- theme: {
- extend: {
- container: {
- center: true,
- }
- },
- },
- plugins: [],
+ presets: [require('frappe-ui/src/utils/tailwind.config')],
+ content: [
+ './index.html',
+ './src/**/*.{vue,js,ts,jsx,tsx}',
+ './node_modules/frappe-ui/src/components/**/*.{vue,js,ts,jsx,tsx}',
+ ],
+ theme: {
+ extend: {
+ container: {
+ center: true,
+ },
+ },
+ },
+ plugins: [],
}
diff --git a/supplier-portal/vite.config.js b/supplier-portal/vite.config.js
index a34158c..d3fb53c 100644
--- a/supplier-portal/vite.config.js
+++ b/supplier-portal/vite.config.js
@@ -5,18 +5,18 @@ import frappeui from 'frappe-ui/vite'
// https://vitejs.dev/config/
export default defineConfig({
- plugins: [frappeui(), vue()],
- resolve: {
- alias: {
- '@': path.resolve(__dirname, 'src'),
- },
- },
- build: {
- outDir: `../${path.basename(path.resolve('..'))}/public/supplier-portal`,
- emptyOutDir: true,
- target: 'es2015',
- },
- optimizeDeps: {
- include: ['frappe-ui > feather-icons', 'showdown', 'engine.io-client'],
- },
-})
\ No newline at end of file
+ plugins: [frappeui(), vue()],
+ resolve: {
+ alias: {
+ '@': path.resolve(__dirname, 'src'),
+ },
+ },
+ build: {
+ outDir: `../${path.basename(path.resolve('..'))}/public/supplier-portal`,
+ emptyOutDir: true,
+ target: 'es2015',
+ },
+ optimizeDeps: {
+ include: ['frappe-ui > feather-icons', 'showdown', 'engine.io-client'],
+ },
+})
diff --git a/suppliers_portal/public/supplier-portal/index.html b/suppliers_portal/public/supplier-portal/index.html
index 8f39a8c..4d33f55 100644
--- a/suppliers_portal/public/supplier-portal/index.html
+++ b/suppliers_portal/public/supplier-portal/index.html
@@ -16,6 +16,6 @@
-
+
|