diff --git a/README.md b/README.md index 068342d..807d7e5 100644 --- a/README.md +++ b/README.md @@ -100,6 +100,6 @@ Point `www` at Cloudflare so the redirect can run (the guide uses a proxied `A` - Australian English. - No invented statistics, reviews, testimonials or customer counts. -- Live tools link to Etsy with **Buy on Etsy**. The bundle is A$179.00 including GST, A$37 less than the four tools bought separately. +- Live tools link to Etsy with **Buy on Etsy**. The bundle is A$179.00 including GST, A$36.99 less than the four tools bought separately. - The refund policy does not limit Australian Consumer Law rights. - The free calculator is simpler than the Charge-Out Rate & Job Costing Calculator: one person, no job costing. Figures stay in the browser. diff --git a/scripts/check-dist.mjs b/scripts/check-dist.mjs index e9c969a..aa22675 100644 --- a/scripts/check-dist.mjs +++ b/scripts/check-dist.mjs @@ -128,6 +128,15 @@ const article2 = read(join(dist, 'blog/what-to-charge-per-hour-as-a-small-trades if (!/tradie charge out rate/i.test(article2)) { throw new Error('Article 2 should use the target keyword in the body or meta'); } +const article2Visible = article2 + .replace(/[\s\S]*?<\/head>/, '') + .replace(/]*type=["']application\/ld\+json["'][^>]*>[\s\S]*?<\/script>/gi, ''); +if (/\btradies?\b/i.test(article2Visible)) { + throw new Error('Article 2 visible copy must not use the word tradie'); +} +if (!/There is no official hourly rate for a trades business/.test(article2Visible)) { + throw new Error('Article 2 visible intro should use the tradie-free excerpt'); +} if (!article2.includes('"@type":"Article"') && !article2.includes('"@type": "Article"')) { throw new Error('Article JSON-LD missing'); } @@ -141,8 +150,11 @@ for (const file of htmlFiles) { const attrs = m[1]; if (!/\bsrc=/.test(attrs) && !/application\/ld\+json/.test(attrs)) throw new Error(`Inline script in ${file}`); } - if (/\btradies?\b/i.test(html.replace(/[\s\S]*?<\/head>/, ''))) { - console.warn(`Note: "tradie" in the body of ${file}`); + const visible = html + .replace(/[\s\S]*?<\/head>/, '') + .replace(/]*type=["']application\/ld\+json["'][^>]*>[\s\S]*?<\/script>/gi, ''); + if (/\btradies?\b/i.test(visible)) { + throw new Error(`Visible copy in ${file} used the word tradie`); } } @@ -219,6 +231,7 @@ for (const file of htmlFiles) { const html = read(file); if (/app\.kit\.com|convertkit\.com/i.test(html)) throw new Error(`Kit reference left in ${file}`); if (/hello@thedigitalkitbag\.com/i.test(html)) throw new Error(`hello@ address left in ${file}`); + if (/orders@thedigitalkitbag\.com/i.test(html)) throw new Error(`orders@ address left in ${file}`); if (/docs\.google\.com/i.test(html)) throw new Error(`docs.google.com link in ${file}`); } for (const page of [ diff --git a/src/components/Footer.astro b/src/components/Footer.astro index d100ce2..e23653a 100644 --- a/src/components/Footer.astro +++ b/src/components/Footer.astro @@ -38,7 +38,6 @@ const { showDisclaimer = true } = Astro.props;
  • Terms
  • Refund policy
  • {site.supportEmail}
  • -
  • {site.ordersEmail}
  • diff --git a/src/content/blog/bas-for-sole-traders.md b/src/content/blog/bas-for-sole-traders.md index 7ea7a82..74e8351 100644 --- a/src/content/blog/bas-for-sole-traders.md +++ b/src/content/blog/bas-for-sole-traders.md @@ -98,7 +98,7 @@ You can lodge a BAS yourself through ATO online services (myGov for sole traders Either way, the job that's always yours is **keeping the records**. Income, expenses, GST in and out, and the tax invoices behind them. Get that right through the quarter and the BAS itself takes minutes, whether you lodge it or your bookkeeper does. -That's what the **[BAS & GST Workbook](/products/bas-gst-workbook/)** (A$49 incl. GST) is for. It has income and expense logs that work out the GST, and a BAS summary that gives **G1, 1A and 1B** in whole dollars on a cash or accrual basis. There are optional PAYG boxes (W1, W2, W4, T7), a **weekly set-aside tracker**, and a check for purchases over $82.50 where you don't hold a tax invoice. It opens in Excel and Google Sheets. A registered tax agent has reviewed the template, but that review is of the file, not tax advice about your business. It won't lodge for you and it doesn't replace a tax or BAS agent. +That's what the **[BAS & GST Workbook](/products/bas-gst-workbook/)** (A$48.99 incl. GST) is for. It has income and expense logs that work out the GST, and a BAS summary that gives **G1, 1A and 1B** in whole dollars on a cash or accrual basis. There are optional PAYG boxes (W1, W2, W4, T7), a **weekly set-aside tracker**, and a check for purchases over $82.50 where you don't hold a tax invoice. It opens in Excel and Google Sheets. A registered tax agent has reviewed the template, but that review is of the file, not tax advice about your business. It won't lodge for you and it doesn't replace a tax or BAS agent. If you want the workbook with the charge-out, getting-paid and subcontractor tools, the Full Kitbag Bundle is all four in one download, A$179 incl. GST on Etsy. diff --git a/src/content/blog/bas-spreadsheet-template.md b/src/content/blog/bas-spreadsheet-template.md index 8664a00..3fafc1a 100644 --- a/src/content/blog/bas-spreadsheet-template.md +++ b/src/content/blog/bas-spreadsheet-template.md @@ -147,7 +147,7 @@ In practice: Everything above you can build in an evening with a blank spreadsheet. If you've done the maths before, go for it. -If you'd rather not, the **[BAS & GST Workbook](/products/bas-gst-workbook/)** (A$49 incl. GST) is this spreadsheet, already built. It has income and expense logs that work out the GST, a BAS summary that gives G1, 1A and 1B in whole dollars on a cash or accrual basis, optional PAYG boxes, a weekly set-aside tracker, and the $82.50 tax invoice check. It opens in Excel and Google Sheets, with a blank file, a clearly marked fictional example and a PDF how-to. A registered tax agent has reviewed the template. That's a review of the file, not tax advice about your business, and it doesn't lodge the BAS for you. +If you'd rather not, the **[BAS & GST Workbook](/products/bas-gst-workbook/)** (A$48.99 incl. GST) is this spreadsheet, already built. It has income and expense logs that work out the GST, a BAS summary that gives G1, 1A and 1B in whole dollars on a cash or accrual basis, optional PAYG boxes, a weekly set-aside tracker, and the $82.50 tax invoice check. It opens in Excel and Google Sheets, with a blank file, a clearly marked fictional example and a PDF how-to. A registered tax agent has reviewed the template. That's a review of the file, not tax advice about your business, and it doesn't lodge the BAS for you. Need the charge-out, invoicing and subcontractor paperwork as well? The Full Kitbag Bundle is all four tools in one download, A$179 incl. GST on Etsy. diff --git a/src/content/blog/end-of-financial-year-checklist-sole-traders.md b/src/content/blog/end-of-financial-year-checklist-sole-traders.md index 3a95ecc..e380dd4 100644 --- a/src/content/blog/end-of-financial-year-checklist-sole-traders.md +++ b/src/content/blog/end-of-financial-year-checklist-sole-traders.md @@ -117,7 +117,7 @@ Our [markup vs margin guide](/blog/markup-vs-margin-calculator/) is a good place ## Where the BAS & GST Workbook fits -The **[BAS & GST Workbook](/products/bas-gst-workbook/)** (A$49 incl. GST) is an Excel workbook (it also opens in Google Sheets) with income and expense logs that work out the GST, a BAS summary that gives G1, 1A and 1B on a cash or accrual basis, and a weekly set-aside tracker. Kept up through the year, it means your books and your June quarter BAS figures are in one place before you sit down with your tax agent. It doesn't lodge anything for you, and it isn't tax advice. +The **[BAS & GST Workbook](/products/bas-gst-workbook/)** (A$48.99 incl. GST) is an Excel workbook (it also opens in Google Sheets) with income and expense logs that work out the GST, a BAS summary that gives G1, 1A and 1B on a cash or accrual basis, and a weekly set-aside tracker. Kept up through the year, it means your books and your June quarter BAS figures are in one place before you sit down with your tax agent. It doesn't lodge anything for you, and it isn't tax advice. Want the job costing, getting-paid and subcontractor tools as well? The Full Kitbag Bundle is all four in one download, A$179 incl. GST on Etsy. diff --git a/src/content/blog/tax-invoice-requirements-australia.md b/src/content/blog/tax-invoice-requirements-australia.md index 2b211a0..efba7f8 100644 --- a/src/content/blog/tax-invoice-requirements-australia.md +++ b/src/content/blog/tax-invoice-requirements-australia.md @@ -176,7 +176,7 @@ Where most small trades businesses come unstuck isn't the invoice layout, though That's what the **[Getting-Paid Kit](/products/getting-paid-kit/)** (A$29 incl. GST) is for. It has GST-registered and not-registered versions of the quote and invoice templates, a payment terms template, a reminder letter sequence, a letter of demand template (marked to get legal advice first) and state guidance pointers, all as Word (.docx) and PDF files, plus an overdue invoice tracker in Excel. The Word and Excel files open in Google Docs and Google Sheets after upload. It's written for Australian trades businesses and built around the ATO's tax invoice rules. It isn't a debt-collection service and it won't make a client pay. It gives you a clear, repeatable way to ask. -If you're GST-registered and want the other half sorted, the **[BAS & GST Workbook](/products/bas-gst-workbook/)** (A$49 incl. GST) logs income and expenses, works out the GST, and gives you G1, 1A and 1B figures before you sit down with your bookkeeper. It also flags purchases over $82.50 where you don't hold a tax invoice. +If you're GST-registered and want the other half sorted, the **[BAS & GST Workbook](/products/bas-gst-workbook/)** (A$48.99 incl. GST) logs income and expenses, works out the GST, and gives you G1, 1A and 1B figures before you sit down with your bookkeeper. It also flags purchases over $82.50 where you don't hold a tax invoice. Want both, plus the charge-out and subcontractor tools? The Full Kitbag Bundle is all four in one download, A$179 incl. GST on Etsy. diff --git a/src/data/faq.ts b/src/data/faq.ts index 514b1e4..bfea0aa 100644 --- a/src/data/faq.ts +++ b/src/data/faq.ts @@ -10,7 +10,7 @@ export const faqItems: FaqItem[] = [ { question: 'Are the tools for sale yet?', answer: - 'All five are, for buyers in Australia, including GST. The Charge-Out Rate & Job Costing Calculator is A$39. The BAS & GST Workbook is A$49. The Getting-Paid Kit is A$29. The Subcontractor Compliance Pack is A$99. The Full Kitbag Bundle is A$179.00, which saves A$37 against buying the four separately (A$216). This website has no checkout.', + 'All five are, for buyers in Australia, including GST. The Charge-Out Rate & Job Costing Calculator is A$39. The BAS & GST Workbook is A$48.99. The Getting-Paid Kit is A$29. The Subcontractor Compliance Pack is A$99. The Full Kitbag Bundle is A$179.00, which saves A$36.99 against buying the four separately (A$215.99). This website has no checkout.', links: [ { href: etsyGoHref('p01', 'faq'), label: 'Charge-Out Rate Calculator on Etsy' }, { href: etsyGoHref('p02', 'faq'), label: 'BAS & GST Workbook on Etsy' }, @@ -37,7 +37,7 @@ export const faqItems: FaqItem[] = [ { question: 'Why is there no price I can pay?', answer: - 'This website has no checkout. The prices are on the Etsy listings, including GST, for buyers in Australia: the Charge-Out Rate Calculator at A$39, the BAS & GST Workbook at A$49, the Getting-Paid Kit at A$29, the Subcontractor Compliance Pack at A$99, and the Full Kitbag Bundle at A$179.00. The four bought separately are A$216, so the bundle saves A$37.', + 'This website has no checkout. The prices are on the Etsy listings, including GST, for buyers in Australia: the Charge-Out Rate Calculator at A$39, the BAS & GST Workbook at A$48.99, the Getting-Paid Kit at A$29, the Subcontractor Compliance Pack at A$99, and the Full Kitbag Bundle at A$179.00. The four bought separately are A$215.99, so the bundle saves A$36.99.', }, { question: 'Can I get a refund?', @@ -68,6 +68,6 @@ export const faqItems: FaqItem[] = [ { question: 'Where do I send a question?', answer: - 'General questions, and a faulty file or one that is not as described, go to support@thedigitalkitbag.com. Orders go to orders@thedigitalkitbag.com.', + 'General questions, a faulty file or one that is not as described, and orders go to support@thedigitalkitbag.com.', }, ]; diff --git a/src/data/products.ts b/src/data/products.ts index 9064941..e0a43e2 100644 --- a/src/data/products.ts +++ b/src/data/products.ts @@ -63,7 +63,7 @@ export const products: Product[] = [ name: 'BAS & GST Workbook', code: '02', edition: 'Australian edition: built for GST and the labels on an Australian BAS.', - priceBand: 'A$49 incl. GST', + priceBand: 'A$48.99 incl. GST', etsyUrl: etsy.basGstWorkbook, etsyCode: 'p02', formats: 'Excel workbooks that also open in Google Sheets, plus a PDF how-to', @@ -89,7 +89,7 @@ export const products: Product[] = [ paragraphs: [ 'GST in Australia is 10% on most goods and services. Registration is generally required once GST turnover is $75,000 or more. Those are ATO figures, and they are a reason to keep the paperwork tidy. They are not a reason to guess your way through a BAS.', 'The workbook holds the logs, the BAS summary and the checks. A registered tax agent has reviewed the template. That review is of the file. It is not tax advice about your business, and the workbook does not lodge the BAS.', - 'Buyers in Australia pay A$49, including GST. The file is sold on Etsy. This website does not take the payment.', + 'Buyers in Australia pay A$48.99, including GST. The file is sold on Etsy. This website does not take the payment.', ], reviewGate: 'A registered tax agent has reviewed the template. That review is of the file. It is not tax advice about your business.', @@ -173,7 +173,7 @@ export const products: Product[] = [ etsyCode: 'p05', formats: 'The four tools together', summary: - 'The four tools in one download. A$179.00 including GST, which saves A$37 against buying them separately for A$216.', + 'The four tools in one download. A$179.00 including GST, which saves A$36.99 against buying them separately for A$215.99.', description: 'The Charge-Out Rate Calculator, BAS & GST Workbook, Getting-Paid Kit and Subcontractor Compliance Pack in one download. A$179.00 including GST. Not tax, legal or financial advice.', audience: 'Owners who want the set rather than one file at a time.', @@ -189,7 +189,7 @@ export const products: Product[] = [ ], paragraphs: [ 'The bundle is the Charge-Out Rate & Job Costing Calculator, the BAS & GST Workbook, the Getting-Paid Kit and the Subcontractor Compliance Pack. Each one is also sold on its own.', - 'Bought separately, the four tools are A$216 including GST. The bundle is A$179.00 including GST, which saves A$37.', + 'Bought separately, the four tools are A$215.99 including GST. The bundle is A$179.00 including GST, which saves A$36.99.', 'Buyers in Australia pay A$179.00, including GST. The file is sold on Etsy. This website does not take the payment.', ], }, diff --git a/src/pages/about.astro b/src/pages/about.astro index 776dc36..c053cb3 100644 --- a/src/pages/about.astro +++ b/src/pages/about.astro @@ -33,7 +33,7 @@ const description =
  • a bundle of those four
  • - All five are on Etsy, including the Full Kitbag Bundle at A$179.00 including GST. Bought separately the four tools are A$216, so the bundle saves A$37. A registered tax agent reviewed the BAS workbook. A lawyer reviewed the subcontractor pack. Neither review is advice about your business. This website does not take the payment. + All five are on Etsy, including the Full Kitbag Bundle at A$179.00 including GST. Bought separately the four tools are A$215.99, so the bundle saves A$36.99. A registered tax agent reviewed the BAS workbook. A lawyer reviewed the subcontractor pack. Neither review is advice about your business. This website does not take the payment.

    Australia comes first. The same kinds of tools may be localised later for New Zealand, the UK, the US and Canada. This site is the Australian one. Spelling, tax and leave rules on these pages are Australian. diff --git a/src/pages/blog/[slug].astro b/src/pages/blog/[slug].astro index 9bdfa16..e7f37b7 100644 --- a/src/pages/blog/[slug].astro +++ b/src/pages/blog/[slug].astro @@ -71,7 +71,7 @@ const articleLd = {

    Field notes · {formatDate(post.data.pubDate)}

    {post.data.title}

    -

    {post.data.description}

    +

    {post.data.excerpt ?? post.data.description}

    {site.disclaimer}

    diff --git a/src/pages/contact.astro b/src/pages/contact.astro index 303fd83..fb5f6ea 100644 --- a/src/pages/contact.astro +++ b/src/pages/contact.astro @@ -4,7 +4,7 @@ import { site } from '../config'; const title = 'Contact | The Digital Kitbag'; const description = - 'Email support@thedigitalkitbag.com for a question or a faulty file, or orders@thedigitalkitbag.com for an order.'; + 'Email support@thedigitalkitbag.com for a question, a faulty file, or an order.'; --- @@ -17,13 +17,10 @@ const description =

    Contact

    Send it in writing.

    -

    Two addresses, both live. Pick the one that matches what you need.

    +

    One address for a question, a faulty file, or an order.

    Useful things to put in the email:

    diff --git a/src/pages/index.astro b/src/pages/index.astro index 289e87e..da011ba 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -80,7 +80,7 @@ const description = All tools

    - All five tools are sold on Etsy. Buyers in Australia pay the price on the card, including GST. The Full Kitbag Bundle is A$179.00 including GST, which saves A$37 against buying the four separately (A$216). This website has no checkout. + All five tools are sold on Etsy. Buyers in Australia pay the price on the card, including GST. The Full Kitbag Bundle is A$179.00 including GST, which saves A$36.99 against buying the four separately (A$215.99). This website has no checkout.

    { diff --git a/src/pages/privacy.astro b/src/pages/privacy.astro index e44a12d..c7a6174 100644 --- a/src/pages/privacy.astro +++ b/src/pages/privacy.astro @@ -23,7 +23,7 @@ const description =

    What we collect

    - If you email {site.supportEmail} or {site.ordersEmail}, we keep that email and our reply so we can deal with what you asked. + If you email {site.supportEmail}, we keep that email and our reply so we can deal with what you asked.

    If you join the mailing list, we store your email address, the date, the page you signed up on and that you ticked the consent box. It is kept in our Cloudflare account (Cloudflare, Inc., which hosts this website) and is not sold or shared. If we later use an email service to send the updates, your address will be moved to it for that purpose only. You can unsubscribe from any email we send, or email {site.supportEmail} to be removed at any time. diff --git a/src/pages/products/[slug].astro b/src/pages/products/[slug].astro index b5aa43c..072cdd5 100644 --- a/src/pages/products/[slug].astro +++ b/src/pages/products/[slug].astro @@ -86,7 +86,7 @@ const buyHref = resolved.etsyCode ? etsyGoHref(resolved.etsyCode, `products-${re

    {resolved.priceBand}

    - {resolved.slug === 'full-kitbag-bundle' &&

    A$216 separately / save A$37

    } + {resolved.slug === 'full-kitbag-bundle' &&

    A$215.99 separately / save A$36.99

    } ) : resolved.priceBand.startsWith('A$') ? (

    diff --git a/src/pages/products/index.astro b/src/pages/products/index.astro index 2480556..eb6d1c7 100644 --- a/src/pages/products/index.astro +++ b/src/pages/products/index.astro @@ -21,7 +21,7 @@ const description =

    The kit

    Tools for the work around the work.

    - Spreadsheets and documents for pricing, getting paid, GST paperwork and subcontractors. Built for sole traders and crews of 1–5. All five are on Etsy. The bundle is A$179.00 including GST, A$37 less than the four bought separately. + Spreadsheets and documents for pricing, getting paid, GST paperwork and subcontractors. Built for sole traders and crews of 1–5. All five are on Etsy. The bundle is A$179.00 including GST, A$36.99 less than the four bought separately.

    {site.disclaimer}

    diff --git a/src/pages/tools/gst-calculator.astro b/src/pages/tools/gst-calculator.astro index e9a4091..a17dd18 100644 --- a/src/pages/tools/gst-calculator.astro +++ b/src/pages/tools/gst-calculator.astro @@ -29,7 +29,7 @@ const description =

    Doing this for a whole quarter?

    - One amount is easy. A quarter of invoices and receipts is where it goes wrong. The BAS & GST Workbook logs your income and expenses, works out the GST on each line, checks you hold a tax invoice for purchases over $82.50, and gives you G1, 1A and 1B for your BAS on a cash or accrual basis. A$49 including GST, or part of the + One amount is easy. A quarter of invoices and receipts is where it goes wrong. The BAS & GST Workbook logs your income and expenses, works out the GST on each line, checks you hold a tax invoice for purchases over $82.50, and gives you G1, 1A and 1B for your BAS on a cash or accrual basis. A$48.99 including GST, or part of the {' '}Full Kitbag Bundle at A$179 including GST.

    Join the email list for new free tools and guides.

    diff --git a/src/pages/tools/lead-cost-calculator.astro b/src/pages/tools/lead-cost-calculator.astro index 6b6903c..916619e 100644 --- a/src/pages/tools/lead-cost-calculator.astro +++ b/src/pages/tools/lead-cost-calculator.astro @@ -30,7 +30,7 @@ const description =

    Not sure what your margin is?

    This sum is only as good as the margin you put in. The Charge-Out Rate & Job Costing Calculator works out your rate and costs a job line by line, for you and a crew of up to five. A$39 including GST, or part of the - {' '}Full Kitbag Bundle at A$179 including GST (A$216 if you bought the four tools separately, so you save A$37). + {' '}Full Kitbag Bundle at A$179 including GST (A$215.99 if you bought the four tools separately, so you save A$36.99).

    Join the email list for the job costing walk-through and new free tools.

    The method, and what a spreadsheet can't count, is written out in is hipages worth it?