1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 05:32:39 +01:00
Commit Graph

519 Commits

Author SHA1 Message Date
Benjamin Beganović
2ad363bf58 modern 2020-10-01 13:33:45 +02:00
Benjamin Beganović
eec2397eb5 hipster 2020-10-01 13:33:42 +02:00
Benjamin Beganović
ecfbf62856 elegant 2020-10-01 13:33:38 +02:00
Benjamin Beganović
40229e7ae3 business 2020-10-01 13:33:30 +02:00
Benjamin Beganović
1ea2c85e13 clean 2020-10-01 13:33:10 +02:00
Benjamin Beganović
a81ed59bc9 bold 2020-10-01 13:33:06 +02:00
Benjamin Beganović
4d959315c6 creative 2020-10-01 13:20:38 +02:00
Benjamin Beganović
2b39c1a5d7 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:31:15 +02:00
Benjamin Beganović
d947d2cfd4 Authorize.net: Payments 2020-09-29 13:17:41 +02:00
Benjamin Beganović
51bf831087 Authorize.net: Authorize CC 2020-09-29 13:13:50 +02:00
Benjamin Beganović
4814194568 Stripe: Sofort 2020-09-29 12:52:27 +02:00
Benjamin Beganović
12c23f14e5 Sofort: Alipay 2020-09-29 12:52:19 +02:00
Benjamin Beganović
58a3cc69a9 Stripe: Pay with credit card 2020-09-29 12:46:28 +02:00
Benjamin Beganović
72f915ef0a Stripe: Authorize ACH 2020-09-29 12:36:21 +02:00
Benjamin Beganović
36d322611e Stripe: Add credit card 2020-09-29 12:31:56 +02: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
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
Benjamin Beganović
f51d7c99df Add whitelabel text to 'plain' design 2020-09-28 11:09:45 +02:00
Benjamin Beganović
c5fcb56ca6 Add whitelabel to e-mail 2020-09-25 13:57:02 +02:00
Benjamin Beganović
ee9bba2ae0 Fix bug with passing correct $amount 2020-09-25 11:25:52 +02:00
Benjamin Beganović
35ed396323 Profile settings: Shipping address 2020-09-24 14:40:27 +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
Benjamin Beganović
a9e40aab37 Profile section: General informatioon 2020-09-24 13:29: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
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
Benjamin Beganović
c6b24d1c75 Checkout: Optin/optout for saving card 2020-09-21 11:34:06 +02:00
Benjamin Beganović
d0894cec37 Authorize.net: Optin/optout for saving card 2020-09-21 11:24:19 +02:00
Benjamin Beganović
3a1906bd87 Stripe: Optin/optout for saving card 2020-09-21 11:17:16 +02: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
8dd8b83fd3 Fixes for passing settings object into all mail templates 2020-09-19 15:02:34 +10:00
David Bomba
23c22dd9dc Fixes for tests 2020-09-19 10:17:13 +10:00
Benjamin Beganović
a1e11cf161 invoices-table fix for balance due 2020-09-18 14:47:36 +02:00
Benjamin Beganović
2bb84fdbd9 Add support for in dark template 2020-09-18 14:38:16 +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ć
8c342d5702 Hide fields without value 2020-09-18 11:02:21 +02:00
Benjamin Beganović
e36ff351de Pass method id when removing record 2020-09-18 09:48:14 +02:00
Benjamin Beganović
9aea0f081a Update designs with correct margins & paddings 2020-09-17 14:38:25 +02:00
Benjamin Beganović
aba699eb12 modern 2020-09-17 14:28:38 +02:00
Benjamin Beganović
449316582a invoiceninja logo into modern footer 2020-09-16 13:27:28 +02:00
Benjamin Beganović
2b70bd89a5 modern 2020-09-11 16:54:56 +02:00
Benjamin Beganović
9563f6e7a2 hipster 2020-09-11 16:50:49 +02:00
Benjamin Beganović
bae6a097d7 elegant 2020-09-11 16:49:59 +02:00
Benjamin Beganović
45e2590d90 creative 2020-09-11 16:48:39 +02:00
Benjamin Beganović
bc519a6f92 clean 2020-09-11 16:48:16 +02:00
Benjamin Beganović
0a33a408f2 business 2020-09-11 16:48:02 +02:00
Benjamin Beganović
d3f312b4ef bold 2020-09-11 16:47:47 +02:00
Benjamin Beganović
78bf39fcd1 plain 2020-09-11 16:46:09 +02:00
Benjamin Beganović
177eaa2ef5 playful 2020-09-11 16:45:55 +02:00
David Bomba
32aa291ff4
Merge pull request #4059 from beganovich/v2-design-polishing
Updates for designs
2020-09-11 21:07:53 +10:00
Benjamin Beganović
9a3dfb4f96 Update design padding & page-break 2020-09-11 11:53:52 +02:00
Benjamin Beganović
ed0fe053ec Hide Gateway Fees from invoices-table (cp) 2020-09-11 10:18:31 +02:00
David Bomba
c55f660f7f Generic handling page for unsuccessful payments 2020-09-11 08:30:12 +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
100ca67c5f Add reference to checkout gateways 2020-09-10 11:23:04 +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ć
2176518345 Update designs margins, font-size variable 2020-09-09 17:08:31 +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
=
1ee6e33bb7 Working on refactoring Checkout.com payment driver to extend BaseDriver 2020-09-09 10:58:35 +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ć
2e66a4df83 Update designs @page margin 2020-09-08 12:40:04 +02:00
Benjamin Beganović
04c807c0b9 Update designs with new table footer 2020-09-08 13:14:44 +02:00
David Bomba
77119e69fe Add primary/secondary_color to companysettings 2020-09-08 14:02:00 +10:00
Benjamin Beganović
0bf39c739d
Merge branch 'v2' into v2-fix-setup-issues 2020-09-07 00:15:45 +02:00
David Bomba
ba75a44eb8
Laravel 7.x Shift (#40)
* Adopt Laravel coding style

The Laravel framework adopts the PSR-2 coding style with some additions.
Laravel apps *should* adopt this coding style as well.

However, Shift allows you to customize the adopted coding style by
adding your own [PHP CS Fixer][1] `.php_cs` config to your project.

You may use [Shift's .php_cs][2] file as a base.

[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200

* Shift bindings

PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser.

* Shift core files

* Shift to Throwable

* Add laravel/ui dependency

* Unindent vendor mail templates

* Shift config files

* Default config files

In an effort to make upgrading the constantly changing config files
easier, Shift defaulted them so you can review the commit diff for
changes. Moving forward, you should use ENV variables or create a
separate config file to allow the core config files to remain
automatically upgradeable.

* Shift Laravel dependencies

* Shift cleanup

* Upgrade to Laravel 7

Co-authored-by: Laravel Shift <shift@laravelshift.com>
2020-09-06 19:38:10 +10:00
Benjamin Beganović
7a5027f1b4 Enable sandboxing with PDFs & fix setup page issues 2020-09-06 04:23:04 +02:00
Benjamin Beganović
1a66f1835f Merge remote-tracking branch 'upstream/v2' into v2-pdfmaker-design-improvements 2020-09-04 13:20:39 +02:00
Benjamin Beganović
0962177252 Remove old designs 2020-09-04 13:18:17 +02:00
Benjamin Beganović
52dea9c665 Assign element ids in templates 2020-09-04 13:16:05 +02:00
Benjamin Beganović
4b6c2bff4c Added footer to designs 2020-09-04 10:18:58 +02:00
Benjamin Beganović
5b67a547d9 Update new designs 2020-09-04 08:42:58 +02:00
Benjamin Beganović
1bbf7392ad Refactor invoice-table for simple model bind & support for gateway-fees 2020-09-03 11:45:47 +02:00
Benjamin Beganović
1f77b87331 Refactor quotes-table for simple model bind 2020-09-03 11:14:24 +02:00
Benjamin Beganović
60ae138e11 Show gateway fees status for invoices 2020-09-02 22:08:12 +02:00
David Bomba
2bd8581592 Fixes for payments with gateway fees 2020-09-01 09:28:37 +10:00
David Bomba
bb4aac1aeb
Merge pull request #4025 from turbo124/v2
Gateway fees implementation
2020-08-31 17:58:43 +10:00
David Bomba
ac08a146a1 Working on gateway fees 2020-08-30 22:00:19 +10:00
David Bomba
c9be746583
Merge pull request #4018 from beganovich/v2-repeating-header-and-footer
Repeating header & footer
2020-08-28 07:07:28 +10:00
David Bomba
1a7d0d3cbd Working on gateway fees across multiple invoices 2020-08-27 22:12:39 +10:00
Benjamin Beganović
c8ff06e61d Update designs with new margins & paddings 2020-08-27 13:01:19 +02:00
Benjamin Beganović
09dc17d3dc Separate header section on templates 2020-08-26 12:51:54 +02:00
David Bomba
ff5d8ad871 Fixes for gateway fees 2020-08-26 11:14:15 +10:00
David Bomba
79e0fa56e2 Convert currency string to float 2020-08-26 10:47:50 +10:00
Benjamin Beganović
5a03d81112 Fix blank page when downloading invoices 2020-08-25 08:55:55 +02:00
Benjamin Beganović
7ed9e733b1 Switch from checkbox to radio buttons for saving card 2020-08-24 11:17:18 +02:00
Benjamin Beganović
2f50217900 Processing modal on payments 2020-08-24 10:28:55 +02:00
Benjamin Beganović
f12553bae8 wip 2020-08-24 09:07:44 +02:00
Benjamin Beganović
e518b3ca8d Stripe (CC): Add spinner for form processing 2020-08-24 08:25:12 +02:00
Benjamin Beganović
c985bdf1aa Hide "Pay now" button if no available payment methods 2020-08-24 07:18:57 +02:00
Benjamin Beganović
a0db7fdb1e Hide "Add payment method" if no bank/credit card gateway configured 2020-08-24 07:18:28 +02:00
David Bomba
662b5b2604
Merge pull request #4004 from turbo124/v2
Update sentry DSN
2020-08-20 23:20:12 +10:00
Benjamin Beganović
b77866c65b Setup break words 2020-08-20 03:14:24 +02:00
Benjamin Beganović
f4698c0108 Support multiple downloads 2020-08-20 03:10:04 +02:00
David Bomba
334860f87b Custom payment drivers 2020-08-20 08:11:46 +10:00