Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-06 03:02:34 +01:00
Code Issues Releases Activity
3,830 Commits 9 Branches 916 Tags 2 GiB
f5c37ac2f4
Commit Graph

2649 Commits

Author SHA1 Message Date
=
1a87b05b96 Display client name if contact is not present 2021-01-01 11:52:42 +11:00
Benjamin Beganović
3d5730d653 pass inclusive taxes 2020-12-31 11:55:09 +01:00
Benjamin Beganović
03cdb516c7 fix issue with gateway type id not being passed 2020-12-31 11:29:40 +01:00
=
02e535b5a1 Fix for recurring invoice null next_send_date 2020-12-31 09:18:29 +11:00
David Bomba
0650f066e2
Merge pull request #4599 from turbo124/v5-develop 
Clean up logging
 2020-12-31 08:48:56 +11:00
Benjamin Beganović
8df80ddab0 fixes for paypal redirecting to stripe 2020-12-30 12:02:04 +01:00
=
876eedd3f4 Clean up logging 2020-12-30 10:38:07 +11:00
=
eabaed87da Fixes for invoice status 2020-12-30 10:23:14 +11:00
=
ccc4133094 Fixes for recurring 2020-12-30 09:24:33 +11:00
=
389c80ca13 Fixes for import 2020-12-30 08:58:48 +11:00
=
9a5b27eb09 Fixes for importing recurring invoices 2020-12-30 08:43:27 +11:00
=
7a058c9ae6 Move logging to nlog 2020-12-30 08:10:03 +11:00
=
48520746a2 Fixes for migration 2020-12-30 07:37:48 +11:00
=
e14bef7eee Migrate invitations from V4 2020-12-29 10:44:24 +11:00
=
b8fae9249b fixes for migration 2020-12-28 17:04:24 +11:00
=
0a9c66cab8 Autoload snappdf in composer post hooks - add client number when importing 2020-12-28 08:58:49 +11:00
=
4129dba08b Test for HTML output for preview controller 2020-12-26 20:26:19 +11:00
David Bomba
b3962986fb
Merge pull request #4577 from turbo124/v5-develop 
Fix for company.users.company_user
 2020-12-26 19:04:03 +11:00
=
53ff009d74 fix for company.users.company_user 2020-12-26 19:03:24 +11:00
Benjamin Beganović
6f7ec1c188
Merge pull request #4574 from beganovich/v5-makeCustomField-refactor 
(v5) Refactor methods for custom fields
 2020-12-25 17:19:02 +01:00
Benjamin Beganović
3219400812
Merge pull request #4575 from beganovich/v5-discount-visibility 
(v5) Show $product.quantity & product.discount based on settings
 2020-12-25 17:18:54 +01:00
Benjamin Beganović
9f58ccb028 Add support for custom Chromium path (ie. support for Windows & Mac) 2020-12-25 14:15:57 +01:00
Benjamin Beganović
b43b52519f Show $product.quantity & product.discount based on settings 2020-12-25 13:45:37 +01:00
Benjamin Beganović
f3f76e9644 remove duplicate methods 2020-12-25 12:30:40 +01:00
Benjamin Beganović
0bbd910490 apply php-cs-fixer 2020-12-25 12:29:42 +01:00
Benjamin Beganović
3198ef3352 paymentemailengine: refactor to makeCustomField 2020-12-25 12:29:13 +01:00
Benjamin Beganović
491d080ab4 add new makeCustomField (centralised refactor) 2020-12-25 12:27:37 +01:00
Benjamin Beganović
ebfbfb6e10 htmlengine: refactor makeCustomField to helpers 2020-12-25 12:27:23 +01:00
Benjamin Beganović
83ec60cf70 Remove unused makeCustomFieldKeyValuePair() method 2020-12-25 12:25:28 +01:00
Benjamin Beganović
85a27941f2 paymentemailengine: refactor formatCustomFieldValue 2020-12-25 12:13:26 +01:00
Benjamin Beganović
710c08cdef update formatCustomField value to accept nullable client 2020-12-25 12:12:56 +01:00
Benjamin Beganović
2f18ab1eeb htmlengine: refactor formatCustomFieldValue 2020-12-25 12:12:43 +01:00
Benjamin Beganović
2963824924
Merge pull request #4572 from beganovich/v5-ninja-generate-setup-key 
(v5) Command to generate app_key value
 2020-12-24 17:07:22 +01:00
Benjamin Beganović
f0dbf2ba71 nlog() 2020-12-24 17:01:34 +01:00
Benjamin Beganović
747e34247f add licence info 2020-12-24 15:42:23 +01:00
Benjamin Beganović
01ad794bce generate setup key command 2020-12-24 15:40:20 +01:00
Benjamin Beganović
77a8771c78 Setup improvements: 
- Disable Test PDF button while network request loading
- Return correct public/test.pdf file path
 2020-12-24 12:25:22 +01:00
David Bomba
bc8c68af18
Merge pull request #4568 from turbo124/v5-develop 
Fix for null values in country table
 2020-12-24 09:21:26 +11:00
Benjamin Beganović
751b355576
Merge pull request #4565 from beganovich/v5-cleanup-browsershot 
(v5) Removing Browsershot & Puppeteer
 2020-12-23 18:10:43 +01:00
Benjamin Beganović
4c351f6658 remove node/npm requirement 2020-12-23 16:32:56 +01:00
Benjamin Beganović
972099d89f fix product key 2020-12-23 15:51:29 +01:00
Benjamin Beganović
f98627e47f Rename product.product_key to product.item 2020-12-23 14:25:12 +01:00
Benjamin Beganović
16edac3738 add support for multiline text 2020-12-23 13:49:25 +01:00
Benjamin Beganović
3251efeb40
Merge pull request #4553 from beganovich/v5-support-for-custom-columns-on-invoice 
(v5) Support for custom columns on invoice
 2020-12-23 13:12:37 +01:00
Benjamin Beganović
ada4f3065c fixes for tests 2020-12-23 11:41:57 +01:00
Benjamin Beganović
a907933d57 transformlineitems -> switch 2020-12-23 11:17:14 +01:00
=
445bf451bf Fixes for tests and throwing correct failure 2020-12-23 09:04:19 +11:00
David Bomba
ef9c0d4975
Merge pull request #4555 from turbo124/v5-develop 
Fixes for import / texts
 2020-12-23 08:38:32 +11:00
=
383d3ab8c1 Fixes for import / texts 2020-12-23 08:38:13 +11:00
Benjamin Beganović
8fd560dcce process custom columns 2020-12-22 13:56:09 +01:00
Benjamin Beganović
eb5ad3a4ea html engine, new $product1-4 variables 2020-12-22 13:55:40 +01:00
Benjamin Beganović
3b4c2ba5b0 add $custom_value in makeinvoicevalues 2020-12-22 13:55:29 +01:00
Benjamin Beganović
f3c57e87f1 Set default margin to standard A4 printing 2020-12-22 09:43:14 +01:00
Benjamin Beganović
69bc664457
Merge pull request #4549 from beganovich/v5-snappdf-integration 
(v5) snappdf support
 2020-12-22 09:31:22 +01:00
Benjamin Beganović
6009d49330
Merge pull request #4546 from beganovich/v5-amount-with-fee 
(v5) Change amount_with_fee source location
 2020-12-22 09:26:24 +01:00
Benjamin Beganović
85d241e15e update global margin 2020-12-21 16:55:47 +01:00
Benjamin Beganović
95c1f60674 Install beganovich/snappdf package 2020-12-21 16:32:04 +01:00
Benjamin Beganović
940c5c77f3 find and setup db by company key in webhook request 2020-12-21 12:19:48 +01:00
Benjamin Beganović
09a5ab4fad Merge remote-tracking branch 'upstream/v5-develop' into v5-amount-with-fee 2020-12-21 12:14:43 +01:00
Benjamin Beganović
f6758873e7 PayPal: Update amount with fee 2020-12-21 12:10:47 +01:00
Benjamin Beganović
0b95e8c8bc Checkout.com: Update amount with fee 2020-12-21 12:10:39 +01:00
Benjamin Beganović
24d76e98f0 Authorize.net: Update amount with fee 2020-12-21 12:10:28 +01:00
Benjamin Beganović
5a8dfd85eb Apply php-cs-fixer 2020-12-21 11:46:46 +01:00
Benjamin Beganović
7764833037 Update Stripe's amount with fee: 
- Update Sofort to support latest architecture for payments
 2020-12-21 11:46:10 +01:00
David Bomba
950a057496
Merge pull request #4545 from turbo124/v5-develop 
Fix for preview
 2020-12-21 20:59:17 +11:00
David Bomba
95455f732b Minor fix for preview 2020-12-21 20:58:55 +11:00
Benjamin Beganović
75902c6d3f Fixes for client number formatting 2020-12-21 09:08:12 +01:00
Benjamin Beganović
6f32fd6c4b
Merge pull request #4527 from beganovich/v5-stripe-webhook-support 
(v5) Stripe support for webhooks
 2020-12-21 08:14:00 +01:00
David Bomba
26cceac505 Fixes for import 2020-12-21 15:55:15 +11:00
David Bomba
ea360cead4 Import notifications 2020-12-21 12:52:33 +11:00
David Bomba
2347b9db7a Import notification 2020-12-21 12:16:26 +11:00
David Bomba
bc06476431 Fix for Quote View Activitry 2020-12-21 10:47:03 +11:00
David Bomba
caa30da38d Ignore HTTPS errors in browsershop 2020-12-21 10:11:33 +11:00
David Bomba
c1edc905db Importing invoices 2020-12-20 20:02:10 +11:00
David Bomba
ccde0eaced Working on importing CSV Invoices 2020-12-20 18:02:58 +11:00
David Bomba
4df646f93b Fixes for tests 2020-12-20 12:21:40 +11:00
David Bomba
d8fab379ac Fixes for release 2020-12-20 08:00:02 +11:00
Benjamin Beganović
92d2a514ca Supprot Stripe for webhooks 2020-12-19 13:11:42 +01:00
David Bomba
6b02d51080 Invoice Import 2020-12-19 18:28:58 +11:00
David Bomba
4877d3c2f5 Working on importing invoices 2020-12-19 15:11:15 +11:00
David Bomba
298deac062 Working on Invoice CSV Import 2020-12-19 14:49:15 +11:00
David Bomba
c3c868b90d Working on Invoice + Payment csv import 2020-12-19 12:45:12 +11:00
=
7285c78afb remove GMP extension requirements 2020-12-19 08:29:32 +11:00
David Bomba
09c2c40903 Fixes for import test 2020-12-18 15:34:40 +11:00
David Bomba
df30f0cbc5 Fixes for github actions 2020-12-18 11:31:27 +11:00
David Bomba
3ad3d0a418 Fix for editting invoice where number in pending state 2020-12-18 07:14:46 +11:00
David Bomba
f45588d26e
Merge pull request #4522 from turbo124/v5-develop 
Handle invoice numbers on restore
 2020-12-18 07:12:17 +11:00
David Bomba
adab53ed97 Handle restoring a deleted invoice 2020-12-18 07:11:31 +11:00
Benjamin Beganović
220c7f080a Provide action selectors to match PDF elements: 
- Add ext-libxml to composer.json
- Support outputting the PDF in CreateEntityPdf.php & GenerateDeliveryNote.php
- Add reference names to Design.php
 2020-12-17 15:44:01 +01:00
Benjamin Beganović
eadcff544f Support for multiline entity public notes. 2020-12-17 14:03:07 +01:00
David Bomba
d3cdfd670f Product import 2020-12-17 23:00:32 +11:00
Benjamin Beganović
6fa90c7060 Change webhook order 2020-12-17 12:47:46 +01:00
Benjamin Beganović
79c6cc474a
Merge pull request #4515 from beganovich/v5-checkout-webhooks-update 
(v5) Support for Checkout @ webhooks
 2020-12-17 12:33:01 +01:00
Benjamin Beganović
5ea07fde66
Merge pull request #4512 from beganovich/v5-remove-trailing-slash-from-setup 
(v5) Remove trailing slash from URLs on setup
 2020-12-17 12:32:47 +01:00
Benjamin Beganović
942652b668 Update webhooks to support Checkout.com & apply php-cs-fixer 2020-12-17 12:27:15 +01:00
David Bomba
c75bd84cbe
Merge pull request #4514 from turbo124/v5-develop 
add enable_product_discount to company table.
 2020-12-17 21:57:10 +11:00
Benjamin Beganović
d8405710e7
Merge pull request #4513 from beganovich/v5-webhooks-refactor 
(wip) (v5) Webhooks refactor
 2020-12-17 11:56:16 +01:00
David Bomba
feb78a63f2 Add service worker back in 2020-12-17 21:53:20 +11:00
Benjamin Beganović
c78a03b095 Remove trailing slash from URLs on setup 2020-12-17 11:10:47 +01:00
David Bomba
24d4095709 Fixes for composer 2020-12-17 10:32:42 +11:00
David Bomba
831d1e0816 revert to exec() to composer install 2020-12-17 10:23:54 +11:00
David Bomba
c498f230d4 Adjustments for post update 2020-12-17 07:12:20 +11:00
David Bomba
d035fce0ac Adjustments for post update 2020-12-17 07:10:06 +11:00
David Bomba
e5c30c67f1
Merge pull request #4506 from turbo124/v5-develop 
Adjustments for post update
 2020-12-17 07:07:42 +11:00
David Bomba
ad156e5935 Adjustments for post update 2020-12-17 07:06:40 +11:00
Benjamin Beganović
d3033c902d wip 2020-12-16 15:25:42 +01:00
Benjamin Beganović
9662d9af92 Update webhooks for Checkout: 
- Update api.php -> gateway_key => company_gateway_id
- Pass correct reference to url in CreditCard.php
- Update PaymentWebhookController.php to support new company_gateway_id
- Update PaymentWebhookRequest.php to resolve company gateway from correct input
 2020-12-16 13:47:10 +01:00
Benjamin Beganović
20c010448a apply php-cs-fixer 2020-12-16 12:52:40 +01:00
Benjamin Beganović
9f4481d35f Enable support for ChromiumPdf on setup 
Add test.pdf to .gitignore
 2020-12-16 12:51:41 +01:00
David Bomba
ece104695c Client Imports 2020-12-16 21:13:02 +11:00
David Bomba
7353687c04 Working on client import 2020-12-16 21:06:20 +11:00
David Bomba
8df553c4cc Working on CSV imports 2020-12-16 11:01:15 +11:00
David Bomba
b087046489 Client import map 2020-12-16 09:17:31 +11:00
David Bomba
5715f34086 Better error handling with self updater 2020-12-16 07:37:30 +11:00
David Bomba
15489e2300
Merge pull request #4499 from turbo124/v5-develop 
Better error handling with self updater
 2020-12-16 07:36:14 +11:00
David Bomba
bff5b94ff0 Better error handling with self updater 2020-12-16 07:35:54 +11:00
Benjamin Beganović
0c1f17cd4e
Merge pull request #4497 from beganovich/v5-fixes-for-chromiumpdf 
(v5) Fixes for ChromiumPdf
 2020-12-15 11:50:44 +01:00
Benjamin Beganović
7ccd10adf9 - Change $global-margin to $global_margin to keep consistency 
- Update designs accordingly
- Update ChromiumPdf version
- Apply php-cs-fixer
 2020-12-15 11:45:04 +01:00
David Bomba
008f3fd45f
Merge pull request #4496 from turbo124/v5-develop 
Client filters by name
 2020-12-15 20:50:42 +11:00
Benjamin Beganović
3b5c592f25
Merge pull request #4492 from beganovich/v5-experimental-chromiumpdf-support 
Experimental PDF rendering
 2020-12-15 10:47:39 +01:00
David Bomba
300e42278f Client filters by name 2020-12-15 20:44:22 +11:00
David Bomba
3c9a8fdd35 Fixes for query filters 2020-12-15 20:38:12 +11:00
David Bomba
5025949eaa CSV import 2020-12-15 15:31:49 +11:00
David Bomba
57ee54032f Import CSV 2020-12-15 09:59:41 +11:00
David Bomba
864892a7d2 Migrate white label license 2020-12-15 08:52:14 +11:00
David Bomba
ed20f2c4bc Null safety in translations 2020-12-15 07:53:31 +11:00
Benjamin Beganović
dcd6574b2d Experimental PDF rendering: 
- Added experimental flag in ninja.php
- Added experimental rendering in PdfMaker.php
- Added dynamic $global-margin for 1cm/0cm based on PDF method
 2020-12-14 17:23:04 +01:00
David Bomba
141f45f402 Minor fixes for currency in expenses 2020-12-14 22:18:54 +11:00
David Bomba
05f4572454
Merge branch 'v5-develop' into v5-develop 2020-12-14 21:44:01 +11:00
David Bomba
64b9f94299 Working on Import / Export 2020-12-14 21:43:07 +11:00
Benjamin Beganović
79570b6118
Merge pull request #4453 from beganovich/v5-custom-payment-driver 
(v5) Custom payment driver
 2020-12-14 10:12:56 +01:00
David Bomba
c0aa30ab58 Import|Export 2020-12-14 16:03:23 +11:00
David Bomba
d115609d3c Import | Exports 2020-12-14 15:59:15 +11:00
David Bomba
8b808c97fa Fixes for expense currency not setting default 2020-12-14 07:58:18 +11:00
David Bomba
2c4aaa2131 Fixes for sentry reporting 2020-12-14 07:37:29 +11:00
David Bomba
0f86b3ec21 Fixes 2020-12-13 21:33:30 +11:00
David Bomba
6f451b8924 Remove redundant info() Change document download route 2020-12-13 20:46:29 +11:00
David Bomba
d440d4421d Fix for doubling client balance erroneously on emailing" 2020-12-13 11:04:56 +11:00
David Bomba
8abce54d7e Fixes for customised language options for Preview Controller 2020-12-13 10:20:03 +11:00
David Bomba
0f861554f0 Fixes for exec and open_basedir checks 2020-12-13 08:06:47 +11:00
David Bomba
1913318124 bump the import cache timeout from 10 minutes to 60 minutes 2020-12-13 07:54:25 +11:00
David Bomba
419b381c21 Filter exceptions 2020-12-12 22:23:29 +11:00
David Bomba
2a1a9e2a16 Working on import 2020-12-12 21:47:52 +11:00
David Bomba
3419d7900f Tests for importing CSV files 2020-12-12 21:35:42 +11:00
David Bomba
584bef52fc Working on import 2020-12-12 21:01:53 +11:00
David Bomba
aa1a788d6e Public document download route 2020-12-12 19:46:28 +11:00
David Bomba
f6ed7be0da Fixes for expense and project numbers 2020-12-12 07:51:10 +11:00
David Bomba
23f07a901b Version bump to 5.0.35 2020-12-11 23:20:46 +11:00
David Bomba
c94eaa4599 Force Custom Language translations before pushing to PhantomJS 2020-12-11 19:54:40 +11:00
David Bomba
6ee4e45d1e Add custom variables 2020-12-11 17:50:54 +11:00