1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 17:01:33 +02:00
Commit Graph

1974 Commits

Author SHA1 Message Date
David Bomba
92c65f73da
Merge pull request #4125 from beganovich/v2-fix-font-size-variable
Rename $font-size to $font_size & remove all comments from designs
2020-10-01 21:45:00 +10:00
David Bomba
ade36d591c Fixes for demo mode 2020-10-01 21:44:17 +10:00
David Bomba
b94bfacc19 Fixes for demo mode in l8 2020-10-01 21:41:23 +10:00
Benjamin Beganović
b40d2bc50b Replace $font-size with $font_size 2020-10-01 13:37:34 +02:00
David Bomba
3fa336946f Fixes for Laravel 8 2020-10-01 21:34:05 +10:00
Benjamin Beganović
5e773a03c8 Add $primary_color & $seconday_color to variables list 2020-10-01 13:20:32 +02:00
David Bomba
c65950672d Fixes for model factories for L8 2020-10-01 20:49:47 +10:00
David Bomba
16b731d010 Bump laravel to version 8 2020-10-01 15:33:38 +10:00
David Bomba
6d779030dc Trust proxies setup 2020-10-01 09:32:27 +10:00
Benjamin Beganović
487c695b68 Replace blue color with $primary_color:
- Change ClientPortal helper to return 'bg-primary-darken' instead of 'active-page'
- Buttons & input fields don't have SASS color now
- bg-blue-600/900 replaced with primary/primary-darken
- Production build of assets
2020-09-30 13:30:27 +02:00
=
09399b3aaa Delete invoice PDF on invoice update! 2020-09-30 19:10:02 +10:00
David Bomba
8756a89885 Allow login using contact_key or client_hash 2020-09-30 08:42:55 +10:00
David Bomba
9b546e66ac Fixes for pdf variables 2020-09-29 22:31:08 +10:00
Benjamin Beganović
a210790a57 Fix overpayments 2020-09-29 14:16:01 +02:00
David Bomba
7a9ab624a3 Working on gateway help url 2020-09-29 14:32:29 +10:00
David Bomba
e310118bf4 Fixes for cleanly deleting and restoring users 2020-09-29 08:08:44 +10:00
David Bomba
3e86da3712 Fixes for tests 2020-09-29 07:54:12 +10:00
David Bomba
1a4d2a4460
Merge pull request #4112 from beganovich/v2-rename-download-files-to-documents
Rename "Downloads" to "Documents":
2020-09-29 06:55:39 +10:00
Benjamin Beganović
69b24f95c4 Centralised variables:
- New Helpers.php with sharedEmailVariables
- Merged settings from TemplateEngine
- @isset check for $whitelabel in the master.blade
2020-09-28 12:36:51 +02:00
David Bomba
7b926980f1
Merge pull request #4111 from turbo124/v2
Only show implemented gateways
2020-09-28 20:34:52 +10:00
Benjamin Beganović
4e9bc0552d Rename "Downloads" to "Documents":
- Remove Livewire auto-publish from composer.json
- Replace old DocumentController with DownloadsController
- Rename DownloadsTable & downloads-table to DocumentsTable & documents-table
- New ShowDocumentRequest for displaying documents
- Change authorize() with DownloadMultipleDocumentsRequest
- Change route in PortalComposer
- Update Livewire assets
- Remove old documents routes
2020-09-28 12:04:34 +02:00
David Bomba
58e48034e7
Merge pull request #4110 from beganovich/v2-rename-downloads-to-documents
(wip) Change Downloads translation to Documents in CP
2020-09-28 20:00:46 +10:00
David Bomba
80ecab54af
Merge pull request #4106 from beganovich/v2-email-footer-whitelabel
Add whitelabel to e-mail
2020-09-28 20:00:28 +10:00
Benjamin Beganović
69b5ec1705 Change Downloads translation to Documents in CP 2020-09-28 11:45:22 +02:00
David Bomba
5c0776cf14 Working on Delete user bug 2020-09-28 12:56:11 +10:00
David Bomba
fd67a48c91 Bug fixes 2020-09-27 20:39:13 +10:00
David Bomba
c965e8d08b Fixes for injecting settings object into email blade templates 2020-09-27 19:22:34 +10:00
David Bomba
3c4bc4a516 Fixes for recurring scheduling 2020-09-26 09:48:42 +10:00
Benjamin Beganović
c5fcb56ca6 Add whitelabel to e-mail 2020-09-25 13:57:02 +02:00
David Bomba
038d5e0406 remove stripe omnipay driver 2020-09-25 20:05:45 +10:00
David Bomba
951188b39e
Merge pull request #4102 from beganovich/v2-profile-settings-in-livewire
Profile settings updates
2020-09-25 07:23:31 +10:00
Benjamin Beganović
35ed396323 Profile settings: Shipping address 2020-09-24 14:40:27 +02:00
Benjamin Beganović
b06c9c18fc Update country_id for personal country id 2020-09-24 14:40:20 +02:00
Benjamin Beganović
2f089707f4 Use Hash:: to encrypt passwords 2020-09-24 14:40:06 +02:00
Benjamin Beganović
554e595211 Profile settings: Shipping address 2020-09-24 14:23:05 +02:00
Benjamin Beganović
e5183dee56 Profile section: Name, website, logo 2020-09-24 13:44:56 +02:00
David Bomba
7e85ee0be3
Merge branch 'v2' into v2 2020-09-24 21:37:17 +10:00
David Bomba
e678f1d373 Fixes for recurring 2020-09-24 21:30:46 +10:00
Benjamin Beganović
a9e40aab37 Profile section: General informatioon 2020-09-24 13:29:41 +02:00
David Bomba
4cf56d5138 Working on recurring schedules 2020-09-24 21:03:59 +10:00
David Bomba
5ca9dae789
Merge pull request #4087 from beganovich/v2-1809-remove-omnipay-from-stripe
Stripe use SDK to refund
2020-09-24 21:00:03 +10:00
Benjamin Beganović
f6263fd59e Disable unused methods from RefundPayment 2020-09-24 12:21:17 +02:00
Benjamin Beganović
f34410cdea Remove logging from StripePaymentDriver 2020-09-24 12:20:57 +02:00
Benjamin Beganović
9b4d166e10 Merge remote-tracking branch 'upstream/v2' into v2-1809-remove-omnipay-from-stripe 2020-09-24 11:36:41 +02:00
Benjamin Beganović
24685db429
Merge branch 'v2' into v2-editable-invoice-amount 2020-09-24 11:33:01 +02:00
Benjamin Beganović
0216286efc Support for over & under payments 2020-09-24 11:29:47 +02:00
David Bomba
b906e1e92f Fixes for hasrecurrence trait 2020-09-24 13:40:13 +10:00
David Bomba
4db72d11e1 Actions for recurring invoices 2020-09-24 10:57:44 +10:00
David Bomba
a43688fd30 Append DELETED to invoice number on delete action 2020-09-23 20:52:54 +10:00
David Bomba
2627ec8894 PHP Cli version 2020-09-23 14:11:34 +10:00
David Bomba
c59e6a2141 Client contact authentication using contact_key 2020-09-23 13:56:56 +10:00
David Bomba
0e5199e052 Working on contact auth using contact key 2020-09-23 11:45:07 +10:00
David Bomba
81ef541d2e Expense API Endpoints 2020-09-23 10:46:35 +10:00
David Bomba
ab0ec5e2cb Vendor API endpoints 2020-09-23 10:16:19 +10:00
David Bomba
10d62f23f8 Fixes for regressions 2020-09-22 16:11:32 +10:00
David Bomba
8d3154a149 Add credit to paymentables on invoice reversal 2020-09-22 13:09:42 +10:00
David Bomba
8c1174b20b
Merge pull request #4095 from beganovich/v2-save-card-details-logic
Save card opt-in/opt-out logic
2020-09-22 07:30:44 +10:00
David Bomba
617a923894 Fixes for notifications: 2020-09-21 20:54:58 +10:00
Benjamin Beganović
3a1906bd87 Stripe: Optin/optout for saving card 2020-09-21 11:17:16 +02:00
David Bomba
78848fff4f fixes 2020-09-21 16:27:02 +10:00
David Bomba
3f62ff941e Add more events when a PDF must be updated 2020-09-21 12:26:10 +10:00
David Bomba
0338a30a48 Fixes for generic email templates 2020-09-21 08:17:57 +10:00
David Bomba
624f8db661 Improve payments page for client portal and fix invoice status after payment made 2020-09-19 20:33:59 +10:00
David Bomba
4b00d3a82a Improve eager loading 2020-09-19 20:05:29 +10:00
David Bomba
8dd8b83fd3 Fixes for passing settings object into all mail templates 2020-09-19 15:02:34 +10:00
=
83be13c049 fixes for types 2020-09-19 12:15:38 +10:00
=
20e4c4b1ad Improve eager loading 2020-09-19 12:05:54 +10:00
=
88eb05786e Fixes for updateinvoicepayment 2020-09-19 11:20:14 +10:00
David Bomba
23c22dd9dc Fixes for tests 2020-09-19 10:17:13 +10:00
David Bomba
bcc63c7a33
Merge pull request #4093 from turbo124/v2
Fixes for tests
2020-09-19 09:52:54 +10:00
David Bomba
3205c2cd09 Fixes for tests 2020-09-19 09:52:35 +10:00
Benjamin Beganović
a1e11cf161 invoices-table fix for balance due 2020-09-18 14:47:36 +02:00
Benjamin Beganović
94ebf95caa Stripe use SDK to refund 2020-09-18 14:35:53 +02:00
Benjamin Beganović
792f9717f7 Dynamic primary color borders on e-mails 2020-09-18 14:27:20 +02:00
David Bomba
12342e6002
Merge pull request #4084 from beganovich/v2-client-portal-fixes
Client portal improvements & fixes
2020-09-18 21:28:59 +10:00
Benjamin Beganović
99d31207e1 Fix quote generating 2020-09-18 10:45:26 +02:00
Benjamin Beganović
210ebb1754 Add placeholder methods for Authorize, Custom & PayPalExpress 2020-09-18 10:01:19 +02:00
Benjamin Beganović
71ca5d108c Detach payment methods from Stripe 2020-09-18 09:48:53 +02:00
Benjamin Beganović
020005d20d Update PaymentMethodController:destroy() with generic gateway detach 2020-09-18 09:48:39 +02:00
David Bomba
083e834400
Merge pull request #4082 from turbo124/v2
Working on recurring invoices
2020-09-18 17:05:05 +10:00
David Bomba
4b482c76f3 Fixes for recurring invoice 2020-09-18 17:04:28 +10:00
David Bomba
67492c3384 Recurring Invoice Invitations 2020-09-18 07:49:22 +10:00
Benjamin Beganović
32b5ee26ba Update $whitelabel variable 2020-09-17 14:28:55 +02:00
David Bomba
24104509b3 Fixes for recurring invoice schema - auto_bill_enabled 2020-09-17 09:26:23 +10:00
David Bomba
7f825f9ed0 Fixes for paid_to_date formatting 2020-09-17 08:24:56 +10:00
David Bomba
6a0f958c2e Fixes for previewing email templates 2020-09-17 08:22:23 +10:00
Benjamin Beganović
0f791fdb7f page-break-inside avoid on footer elements 2020-09-16 12:18:34 +02:00
Benjamin Beganović
1dcc24d06b Fix $details_label & texts.thanks on Elegant design 2020-09-16 12:16:56 +02:00
David Bomba
03e9bf0bc7 Fixes for recurring 2020-09-16 20:08:51 +10:00
David Bomba
7e3dd1bf67 Fixes for create test data 2020-09-16 17:06:06 +10:00
David Bomba
8471c2689f Fix for user_confirmation code 2020-09-16 09:56:10 +10:00
David Bomba
71c3865bb5 Fix bug with recurring invoice factory not setting a client 2020-09-16 09:29:23 +10:00
David Bomba
69de2fc740 fixes for transformeR 2020-09-15 16:44:58 +10:00
David Bomba
766343d8b9 Recurring dates 2020-09-14 22:13:15 +10:00
David Bomba
bae82b56c1 Add license 2020-09-14 21:11:46 +10:00
David Bomba
aeeb099d40 Fixes for mailers 2020-09-14 15:14:37 +10:00
David Bomba
559a4d831f Show npm/node status in health check 2020-09-14 08:25:09 +10:00
David Bomba
14528280d8 Fixes for recurring transformer 2020-09-14 08:21:59 +10:00
David Bomba
5f896de3bd Add auto_bill to recurring invoice transformer 2020-09-13 21:55:06 +10:00
David Bomba
37bbe8f1e3 Fixes for validation on recurring 2020-09-13 21:46:03 +10:00
David Bomba
9c7dc24bd2 Recurring Dates 2020-09-13 20:20:11 +10:00
David Bomba
2b877d3414 Working on recurringDates Array 2020-09-12 20:33:12 +10:00
David Bomba
89dcd43e47 Fixes for contact password not sticking on update 2020-09-12 19:53:28 +10:00
Benjamin Beganović
3ac3f6006c footer logic for custom props 2020-09-11 16:46:49 +02:00
David Bomba
4f879c815d
Merge pull request #4058 from beganovich/v2-hide-gateway-fees-from-invoices-table
Client portal: Hide "Gateway Fees" from invoices-table
2020-09-11 19:11:12 +10:00
David Bomba
ce4b5098fc
Merge pull request #4057 from beganovich/v2-show-fees-on-pdfs
Show taxes/fees on bottom of PDFs
2020-09-11 19:10:52 +10:00
Benjamin Beganović
ed0fe053ec Hide Gateway Fees from invoices-table (cp) 2020-09-11 10:18:31 +02:00
Benjamin Beganović
6673d58b3a Show fees on bottom of PDFs 2020-09-11 10:07:59 +02:00
Benjamin Beganović
de6034f3d4 Don't skip items with type_id = 4 2020-09-11 09:23:16 +02:00
David Bomba
6e588f7925 Fixes for checkout.com 2020-09-11 16:31:49 +10:00
David Bomba
f0bd089acb
Merge pull request #4054 from turbo124/v2
Gateway fees and payments.
2020-09-11 16:15:53 +10:00
David Bomba
9eaa136cc3 Clean up 2020-09-11 10:14:51 +10:00
David Bomba
2f7e01c5a4 Fixes for paid invoices via gateways 2020-09-11 10:10:53 +10:00
David Bomba
0b56e8d4cb handle payments and gateway fee integration 2020-09-11 09:01:25 +10:00
David Bomba
c55f660f7f Generic handling page for unsuccessful payments 2020-09-11 08:30:12 +10:00
Benjamin Beganović
1b36dc5868 cleanup 2020-09-10 13:01:34 +02:00
Benjamin Beganović
207c9388b5 Fix migration issues 2020-09-10 13:01:10 +02:00
David Bomba
f7dc573551 Fixes for invoices 2020-09-10 15:20:13 +10:00
David Bomba
9beafcd73b
Merge pull request #4052 from turbo124/v2
Fixes for Checkout.com
2020-09-10 14:42:26 +10:00
David Bomba
f061fd49f9 fixes for checkout payment gateway 2020-09-10 14:41:56 +10:00
David Bomba
d071ed0d3b Attach payment_id to payment_hash 2020-09-10 11:52:17 +10:00
David Bomba
100ca67c5f Add reference to checkout gateways 2020-09-10 11:23:04 +10:00
David Bomba
0c015cb4bc Fixes for recurring invoices 2020-09-10 11:05:42 +10:00
David Bomba
519293c6dd
Merge pull request #4051 from beganovich/v2-design-improvements
Design improvements
2020-09-10 07:43:32 +10:00
Benjamin Beganović
3b7bf97dd8 Add $font-size variable & fix insert of designs 2020-09-09 17:14:55 +02:00
Benjamin Beganović
6288529907 - Accept every design as CUSTOM in PreviewController
- Logic for excluding elements in table footer
- PdfMaker will now return plain HTML + str_replace filter
- HTMLEngine updated variables and aliases
- Added 'payment_due' translation
- Hipster: Updated variables
2020-09-09 14:47:26 +02:00
David Bomba
6147cb1edc Fix for designs 2020-09-09 20:39:35 +10:00
David Bomba
c67fee3fff Fixes for base driver 2020-09-09 20:05:10 +10:00
=
1ee6e33bb7 Working on refactoring Checkout.com payment driver to extend BaseDriver 2020-09-09 10:58:35 +10:00
David Bomba
605f4d0b0c Fixes for migrations 2020-09-09 07:37:07 +10:00
David Bomba
b9c868d3ff Sort recurring / invoices transformers for comparison 2020-09-09 07:33:21 +10:00
Benjamin Beganović
3104f4ed06 Merge remote-tracking branch 'upstream/v2' into v2-design-tfoot 2020-09-08 14:37:37 +02:00
Benjamin Beganović
78503c4608 Fix footer position 2020-09-08 14:37:21 +02:00
Benjamin Beganović
2635b8c090 Fix logic for all_pages_header/footer 2020-09-08 14:26:13 +02:00
Benjamin Beganović
14dc3ea2aa Engine for editing templates 2020-09-08 13:21:07 +02:00
David Bomba
f8f8da830e Working on recurring invoices + reminders 2020-09-08 21:01:55 +10:00
David Bomba
84ec6b35cd Add additional fields to company settings auto_bill_date + client_portal_under_payment_minimum 2020-09-08 20:53:16 +10:00
David Bomba
857fa8a57f Force admin only permissions on system logs 2020-09-08 20:49:17 +10:00
David Bomba
3083ab6237 Set unique on Group Settings Name 2020-09-08 20:44:32 +10:00
Benjamin Beganović
2e66a4df83 Update designs @page margin 2020-09-08 12:40:04 +02:00
Benjamin Beganović
0902b903a7 Insert elements as span 2020-09-08 14:30:20 +02:00
David Bomba
f5eecf0eb6 Working on recurring 2020-09-08 20:34:14 +10:00
David Bomba
c389ff49f2 Add missing data fields from HtmlEngine 2020-09-08 14:06:46 +10:00
David Bomba
77119e69fe Add primary/secondary_color to companysettings 2020-09-08 14:02:00 +10:00
David Bomba
a384db6ee8 Fix for composer --no-dev 2020-09-08 07:01:53 +10:00
David Bomba
9740edc091
Merge pull request #4042 from turbo124/v2
Clean up for improvements to composer
2020-09-07 20:19:52 +10:00
David Bomba
884f8f186a Clean up for improvements to composer 2020-09-07 20:18:56 +10:00
David Bomba
ca34e77530
Merge pull request #4041 from turbo124/v2
Improve update process
2020-09-07 20:05:39 +10:00
David Bomba
4a85081f3a Composer install 2020-09-07 20:03:47 +10:00
David Bomba
94508a30b3 Composer install 2020-09-07 20:00:20 +10:00