From 4730f5770c25d1d7b95c5cb09234d103dae3943d Mon Sep 17 00:00:00 2001 From: twotalesanimation <80506065+twotalesanimation@users.noreply.github.com> Date: Fri, 2 Jan 2026 12:22:21 +0200 Subject: [PATCH] update before thirdparty integration --- config/dompdf.php | 4 +- .../views/invoices/order-invoice.blade.php | 203 +- storage/fonts/Montserrat-Black.ttf | Bin 0 -> 462844 bytes storage/fonts/Montserrat-Bold.ttf | Bin 0 -> 454864 bytes storage/fonts/Montserrat-ExtraBold.ttf | Bin 0 -> 455468 bytes storage/fonts/Montserrat-Medium.ttf | Bin 0 -> 447320 bytes storage/fonts/Montserrat-Regular.ttf | Bin 0 -> 445928 bytes ...ormal_0b0dfdfc635ff964aa0fd5a2628a286e.ttf | Bin 0 -> 58448 bytes ...ormal_0b0dfdfc635ff964aa0fd5a2628a286e.ufm | 424 +++ ..._0b0dfdfc635ff964aa0fd5a2628a286e.ufm.json | 818 +++++ storage/fonts/installed-fonts.json | 12 + ..._bold_b1e1dbf4d5fde9533f68388ba51aca1d.ttf | Bin 0 -> 454864 bytes ..._bold_b1e1dbf4d5fde9533f68388ba51aca1d.ufm | 1341 +++++++++ ..._b1e1dbf4d5fde9533f68388ba51aca1d.ufm.json | 2654 +++++++++++++++++ ...ormal_9cd398fbad47e4e0c71e816b57c7a88f.ttf | Bin 0 -> 445928 bytes ...ormal_9cd398fbad47e4e0c71e816b57c7a88f.ufm | 1341 +++++++++ ..._9cd398fbad47e4e0c71e816b57c7a88f.ufm.json | 2654 +++++++++++++++++ .../0d0747e2a13933433edef872640f05d3.php | 4 + .../1040ea34596f21e6f881fddcd7dfd175.php | 83 + .../108132a734d2396caa58c2df118e237f.php | 12 + .../1a6b8f1ffc2cf4952fe77a2fcb407f70.php | 6 + .../1d993ac30bdc494d2d48e31a89c3efa2.php | 115 + .../1ff25d24253ec4f994d80bdbcd06f4e8.php | 77 + .../29bd56d8868fdc5c6a23dc325777c2dd.php | 65 + .../326dd35a723ea4d93e65f8c2259f892f.php | 11 + .../39584cdd6dcd0bdb0575747e80f1cd65.php | 203 +- .../4a75a20a22bbf7acb4a311fbd528d536.php | 393 +++ .../5e8f491a74633c64247dc2ff2051ddae.php | 5 + .../5e9cca7153f52f08019ad21349cb92b5.php | 60 + .../5f072a72e3552662e9270c1cd9fe4b3c.php | 5 + .../65e45e6ec8708e54e5604682a5e7e776.php | 157 + .../667469216feb75ad429bd95059f79598.php | 4 + .../68f7da36c74ca6c31321a7987bd7bcf5.php | 5 + .../72763a90cb62662820d6c99d705d40a2.php | 4 + .../7af7706bd9ffb244889519c21e05473c.php | 69 + .../7ec497bf31e469c829de2170136a5478.php | 4 + .../82ba5f53693f501a19576db4ac404b61.php | 11 + .../83ec2e4ff2b0c48ad729236b2b327c8a.php | 167 ++ .../843fce3b2bde0e0e15d7bcdc84da71a2.php | 35 + .../8e981c2f85d062624e1aaeb59551f54b.php | 108 + .../929a92bd9017fc7c7f9ebc7d9d5349f8.php | 51 + .../95ed71e8a3dcb0e66ef64e6acf302fc1.php | 79 + .../99c043b5b5bd8abf6d8da67f0fb54a57.php | 80 + .../a305a7181e0742057015290d98f6a4a5.php | 374 +++ .../a9dcd0c48ccc95aa57581ede00d288b4.php | 180 ++ .../b597564feacf9c4001a1ea3ad0910dd4.php | 48 + .../c2e77f61b50c2a31ae998f9ca80d80e4.php | 170 ++ .../cd252183c628c82b5b487cbb974a255a.php | 5 + .../ce93c3faf06bd8ff5bf4d3084c6ed953.php | 28 + .../d070e6a895822fd7ac9632fe1b8bee48.php | 57 + .../d267ee1bddd973eaedd9113cde6689b5.php | 98 + .../e4cf9f54e6bfc0faddd598fde848ceb2.php | 8 + .../e67ad96133e6fb98e5f9f4254566ab80.php | 12 + .../ea7f36bb8911790eb6edfc04f75bc80c.php | 79 + .../f0c90cf917899dacdf335665272a06e4.php | 6 + .../f333ce0d1fb24a43084da1741c9ba7f7.php | 61 + .../f52c4e3599610524466ea24050b8f3e8.php | 4 + .../fe2ed18506153cf881b9decf8a4f5f96.php | 12 + 58 files changed, 12188 insertions(+), 218 deletions(-) create mode 100644 storage/fonts/Montserrat-Black.ttf create mode 100644 storage/fonts/Montserrat-Bold.ttf create mode 100644 storage/fonts/Montserrat-ExtraBold.ttf create mode 100644 storage/fonts/Montserrat-Medium.ttf create mode 100644 storage/fonts/Montserrat-Regular.ttf create mode 100644 storage/fonts/abrilfatface_normal_0b0dfdfc635ff964aa0fd5a2628a286e.ttf create mode 100644 storage/fonts/abrilfatface_normal_0b0dfdfc635ff964aa0fd5a2628a286e.ufm create mode 100644 storage/fonts/abrilfatface_normal_0b0dfdfc635ff964aa0fd5a2628a286e.ufm.json create mode 100644 storage/fonts/installed-fonts.json create mode 100644 storage/fonts/montserrat_bold_b1e1dbf4d5fde9533f68388ba51aca1d.ttf create mode 100644 storage/fonts/montserrat_bold_b1e1dbf4d5fde9533f68388ba51aca1d.ufm create mode 100644 storage/fonts/montserrat_bold_b1e1dbf4d5fde9533f68388ba51aca1d.ufm.json create mode 100644 storage/fonts/montserrat_normal_9cd398fbad47e4e0c71e816b57c7a88f.ttf create mode 100644 storage/fonts/montserrat_normal_9cd398fbad47e4e0c71e816b57c7a88f.ufm create mode 100644 storage/fonts/montserrat_normal_9cd398fbad47e4e0c71e816b57c7a88f.ufm.json create mode 100644 storage/framework/views/0d0747e2a13933433edef872640f05d3.php create mode 100644 storage/framework/views/1040ea34596f21e6f881fddcd7dfd175.php create mode 100644 storage/framework/views/108132a734d2396caa58c2df118e237f.php create mode 100644 storage/framework/views/1a6b8f1ffc2cf4952fe77a2fcb407f70.php create mode 100644 storage/framework/views/1d993ac30bdc494d2d48e31a89c3efa2.php create mode 100644 storage/framework/views/1ff25d24253ec4f994d80bdbcd06f4e8.php create mode 100644 storage/framework/views/29bd56d8868fdc5c6a23dc325777c2dd.php create mode 100644 storage/framework/views/326dd35a723ea4d93e65f8c2259f892f.php create mode 100644 storage/framework/views/4a75a20a22bbf7acb4a311fbd528d536.php create mode 100644 storage/framework/views/5e8f491a74633c64247dc2ff2051ddae.php create mode 100644 storage/framework/views/5e9cca7153f52f08019ad21349cb92b5.php create mode 100644 storage/framework/views/5f072a72e3552662e9270c1cd9fe4b3c.php create mode 100644 storage/framework/views/65e45e6ec8708e54e5604682a5e7e776.php create mode 100644 storage/framework/views/667469216feb75ad429bd95059f79598.php create mode 100644 storage/framework/views/68f7da36c74ca6c31321a7987bd7bcf5.php create mode 100644 storage/framework/views/72763a90cb62662820d6c99d705d40a2.php create mode 100644 storage/framework/views/7af7706bd9ffb244889519c21e05473c.php create mode 100644 storage/framework/views/7ec497bf31e469c829de2170136a5478.php create mode 100644 storage/framework/views/82ba5f53693f501a19576db4ac404b61.php create mode 100644 storage/framework/views/83ec2e4ff2b0c48ad729236b2b327c8a.php create mode 100644 storage/framework/views/843fce3b2bde0e0e15d7bcdc84da71a2.php create mode 100644 storage/framework/views/8e981c2f85d062624e1aaeb59551f54b.php create mode 100644 storage/framework/views/929a92bd9017fc7c7f9ebc7d9d5349f8.php create mode 100644 storage/framework/views/95ed71e8a3dcb0e66ef64e6acf302fc1.php create mode 100644 storage/framework/views/99c043b5b5bd8abf6d8da67f0fb54a57.php create mode 100644 storage/framework/views/a305a7181e0742057015290d98f6a4a5.php create mode 100644 storage/framework/views/a9dcd0c48ccc95aa57581ede00d288b4.php create mode 100644 storage/framework/views/b597564feacf9c4001a1ea3ad0910dd4.php create mode 100644 storage/framework/views/c2e77f61b50c2a31ae998f9ca80d80e4.php create mode 100644 storage/framework/views/cd252183c628c82b5b487cbb974a255a.php create mode 100644 storage/framework/views/ce93c3faf06bd8ff5bf4d3084c6ed953.php create mode 100644 storage/framework/views/d070e6a895822fd7ac9632fe1b8bee48.php create mode 100644 storage/framework/views/d267ee1bddd973eaedd9113cde6689b5.php create mode 100644 storage/framework/views/e4cf9f54e6bfc0faddd598fde848ceb2.php create mode 100644 storage/framework/views/e67ad96133e6fb98e5f9f4254566ab80.php create mode 100644 storage/framework/views/ea7f36bb8911790eb6edfc04f75bc80c.php create mode 100644 storage/framework/views/f0c90cf917899dacdf335665272a06e4.php create mode 100644 storage/framework/views/f333ce0d1fb24a43084da1741c9ba7f7.php create mode 100644 storage/framework/views/f52c4e3599610524466ea24050b8f3e8.php create mode 100644 storage/framework/views/fe2ed18506153cf881b9decf8a4f5f96.php diff --git a/config/dompdf.php b/config/dompdf.php index 7b30e39..be455f0 100644 --- a/config/dompdf.php +++ b/config/dompdf.php @@ -30,7 +30,7 @@ return [ | By default DOMPDF_FONT_DIR is set to storage_path('fonts/'). | */ - 'font_dir' => env('DOMPDF_FONT_DIR', storage_path('fonts/')), + 'font_dir' => storage_path('fonts/'), /* |-------------------------------------------------------------------------- @@ -40,7 +40,7 @@ return [ | By default DOMPDF_FONT_CACHE is set to storage_path('fonts/'). | */ - 'font_cache' => env('DOMPDF_FONT_CACHE', storage_path('fonts/')), + 'font_cache' => storage_path('fonts/'), /* |-------------------------------------------------------------------------- diff --git a/resources/views/invoices/order-invoice.blade.php b/resources/views/invoices/order-invoice.blade.php index b7bc453..b30dbf6 100644 --- a/resources/views/invoices/order-invoice.blade.php +++ b/resources/views/invoices/order-invoice.blade.php @@ -11,9 +11,34 @@ padding: 0; box-sizing: border-box; } + + @font-face { + font-family: 'AbrilFatface'; + font-style: normal; + font-weight: 400; + src: url('{{ storage_path("fonts/AbrilFatface-Regular.ttf") }}') format('truetype'); + } + + + @font-face { + font-family: 'Montserrat'; + font-style: normal; + font-weight: 400; + src: url('{{ storage_path("fonts/Montserrat-Regular.ttf") }}') format('truetype'); + } + + @font-face { + font-family: 'Montserrat'; + /* font-style: normal; */ + font-weight: 700; + src: url('{{ storage_path("fonts/Montserrat-Bold.ttf") }}') format('truetype'); + } + + body { - font-family: 'Montserrat', sans-serif; - color: #333; + font-family: Montserrat; + font-style: normal; + font-weight: 400; line-height: 1.6; background: white; } @@ -29,72 +54,72 @@ display: flex; justify-content: space-between; align-items: flex-start; - margin-bottom: 20px; + margin-bottom: 8px; border-bottom: 1px solid #1a1a1a; padding-bottom: 20px; + gap: 40px; + } + + .company-info { + flex: 1; } .company-info h1 { - font-family: Abril Fatface; - font-size: 36px; - color: #1a1a1a; - margin-bottom: 10px; + font-family: AbrilFatface, Georgia, serif; font-weight: normal; + font-size: 36px; + margin-bottom: 5px; + } + + .company-details h2 { + font-family: AbrilFatface; + font-weight: normal; + font-size: 20px; + /* margin-bottom: 10px; */ } .company-details { font-size: 10px; - color: #666; - line-height: 1.5; + line-height: 1.2; + } + + .invoice-details h2 { + font-family: AbrilFatface; + font-weight: normal; + font-size: 20px; + /* margin-bottom: 10px; */ } .invoice-details { text-align: right; - /* line-height: 1.5; */ - } - - .invoice-details h2 { - font-size: 28px; - color: #1a1a1a; - font-weight: normal; - /* margin-bottom: 20px; */ - font-family: 'AbrilFatface', Georgia, serif; + flex-shrink: 0; } .detail-row { display: flex; justify-content: flex-end; - /* margin-bottom: 8px; */ font-size: 10px; } .detail-row strong { margin-right: 20px; - color: #666; width: 120px; } .detail-row span { - color: #1a1a1a; width: 150px; } - .section-title { + .customer-info h3 { + font-family: AbrilFatface, Georgia, serif; + font-weight: normal; font-size: 20px; - font-weight: 700; - text-transform: uppercase; - letter-spacing: 1px; - color: #666; - margin-top: 20px; - /* margin-bottom: 20px; */ - /* border-bottom: 1px solid #e0e0e0; */ - padding-bottom: 12px; + /* text-transform: uppercase; */ + /* letter-spacing: 0.5px; */ } .customer-info { display: flex; - /* gap: 80px; */ - /* margin-bottom: 40px; */ font-size: 12px; } @@ -102,63 +127,59 @@ flex: 1; } - .customer-info h3 { - font-size: 16px; - font-weight: 700; - text-transform: uppercase; - letter-spacing: 0.5px; - color: #666; - /* margin-bottom: 8px; */ - } + .customer-info p { - color: #1a1a1a; - /* margin-bottom: 4px; */ - line-height: 1.5; + line-height: 1.2; + } + + .section-title { + font-family: AbrilFatface, Georgia, serif; + font-weight: normal; + font-size: 20px; + /* margin-top: 20px; */ + padding-bottom: 12px; } table { width: 100%; border-collapse: collapse; - margin-bottom: 40px; + margin-bottom: 20px; } thead { - background-color: #f5f5f5; + background-color: #f5f3f0; } th { font-size: 12px; - font-weight: 700; text-transform: uppercase; letter-spacing: 0.5px; - color: #666; - padding: 12px 16px; + padding: 2px 16px; text-align: left; - /* border: 1px solid #e0e0e0; */ } td { - padding: 10px 10px; - /* border: 1px solid #e0e0e0; */ + padding: 0px 10px; font-size: 13px; - color: #1a1a1a; } tr:nth-child(even) { - background-color: #fafafa; + background-color: #f5f3f0; } .item-name { - font-weight: 500; + font-family: AbrilFatface, Georgia, serif; + font-weight: normal; + padding: 0px 10px; } .item-label { font-size: 11px; - color: #999; text-transform: uppercase; letter-spacing: 0.5px; - /* margin-top: 2px; */ + padding: 0px 20px; + } .qty { @@ -170,70 +191,40 @@ } .totals-section { - margin-bottom: 40px; + /* margin-bottom: 40px; */ + background-color: #e8dcd8; + padding: 8px; + border-radius: 20px; } .totals-box { margin-left: auto; width: 350px; + padding: 0px 16px; } .total-row { display: flex; - padding: 12px 16px; font-size: 13px; - } - - .total-row strong { - color: #1a1a1a; - } - - .total-row span { - color: #666; - text-align: right; - flex: 1; - } - - .total-row.subtotal strong { - font-weight: 500; - } - - .total-row.shipping strong { - font-weight: 500; + padding: 0px 16px; } .total-row.grand-total { - /* background-color: #f5f5f5; */ - /* border: 1px solid #e0e0e0; */ - font-size: 15px; - font-weight: 700; - padding: 12px 16px; - + font-family: AbrilFatface, Georgia, serif; + font-size: 30px; + padding: 0px 16px; } - .total-row.grand-total strong { - color: #1a1a1a; - font-family: 'AbrilFatface', Georgia, serif; - font-weight: normal; - } - - .total-row.grand-total span { - color: #1a1a1a; - font-size: 16px; - - } .footer-section { margin-top: 60px; - padding-top: 30px; - border-top: 1px solid #e0e0e0; + /* padding-top: 30px; */ + /* border-top: 1px solid #e0e0e0; */ font-size: 12px; - color: #999; text-align: center; } .thank-you { - color: #666; margin-bottom: 20px; } @@ -249,9 +240,9 @@
registered trading name of
TWO TALES & CO. (PTY) LTD
REG: 2014/260746/07
@@ -261,7 +252,7 @@{{ $order->customer_name }}
{{ $order->customer_email }}
{{ $order->customer_phone }}
-{{ $order->shipping_address }}
-