Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 15:13:29 +01:00
Code Issues Releases Activity
9,615 Commits 9 Branches 923 Tags 2 GiB
f0b51b7949
Commit Graph

5305 Commits

Author SHA1 Message Date
David Bomba
57852a6ca4 Fixes for token billing - payfast 2021-09-23 10:07:29 +10:00
Benjamin Beganović
65b1feddbe Parse line breaks for terms, public notes & footer 2021-09-22 13:21:00 +02:00
David Bomba
37aec1689d Selectively show recurring dates schedule 2021-09-22 20:29:02 +10:00
David Bomba
a93baadd1a Minor fixeS 2021-09-22 18:50:19 +10:00
David Bomba
449649b748 Minor fixes 2021-09-22 18:48:33 +10:00
David Bomba
0c89f998eb Fixes for restoring models 2021-09-22 07:45:06 +10:00
David Bomba
19910d2867 Minor fixes for braintree 2021-09-22 07:35:57 +10:00
David Bomba
6bcca461ef Fixes for statements 2021-09-21 22:50:44 +10:00
David Bomba
cdd6bee046 Minor fixes 2021-09-21 22:45:28 +10:00
David Bomba
5837d544ea return early if no payments 2021-09-21 22:40:00 +10:00
David Bomba
289c4952a0
Merge pull request #6686 from beganovich/v5-statements-json-fixes 
Client portal: Statements page in pure Javascript
 2021-09-21 22:20:26 +10:00
Benjamin Beganović
2621c6af0c Remove Statement component 2021-09-21 14:10:02 +02:00
David Bomba
bff18c126a Fixes for SOFORT 2021-09-21 21:38:35 +10:00
David Bomba
067c97a0a9 Fixes for Stripe payment methods 2021-09-21 19:55:15 +10:00
David Bomba
d4c9a72ff9
Merge pull request #6689 from turbo124/v5-develop 
Force defaults to show in preview
 2021-09-21 13:04:52 +10:00
David Bomba
4684c23667 Force defaults to show in preview 2021-09-21 13:04:23 +10:00
David Bomba
978e718fd3
Merge pull request #6667 from beganovich/v5-689 
Connect payment intent with SOFORT payments
 2021-09-21 09:42:48 +10:00
David Bomba
f572b61d61
Merge pull request #6687 from turbo124/v5-develop 
Add inline download capability
 2021-09-21 08:37:52 +10:00
David Bomba
2c7dcf0a4e Ensure clients have a contact post import 2021-09-21 08:04:25 +10:00
David Bomba
b2baadc429 Resolve client correctly in webhooks 2021-09-21 07:52:21 +10:00
David Bomba
7f28f859ee
Merge pull request #6680 from beganovich/v5-691 
(v5) Show partial on the quotes
 2021-09-21 07:25:46 +10:00
Benjamin Beganović
b62134a5ff Add partial_due to quotes in totals table 2021-09-20 15:00:54 +02:00
Benjamin Beganović
00e37ea681 Sum balance instead of amount 2021-09-20 14:55:16 +02:00
Benjamin Beganović
a5852f61fe Order invoices & payments by number ASC 2021-09-20 14:54:57 +02:00
Benjamin Beganović
ed3d148e45 Update request body: Passing specific options 2021-09-20 14:54:44 +02:00
Benjamin Beganović
db81802dab Merge remote-tracking branch 'upstream/v5-develop' into v5-647 2021-09-20 14:41:39 +02:00
=
6b9b12d723 Add 2021-09-20 21:19:03 +10:00
=
6c1b0c24d0 Add inline download capability 2021-09-20 21:16:28 +10:00
David Bomba
3d28159702 minor fixes 2021-09-20 20:10:07 +10:00
Benjamin Beganović
c1efcba422 Showing partial due on the quotes 2021-09-20 08:50:22 +02:00
Benjamin Beganović
a2eec608d9 Support for 1:1 columns 2021-09-20 08:47:54 +02:00
Benjamin Beganović
3f0847749f
Merge branch 'v5-develop' into v5-689 2021-09-20 08:12:42 +02:00
Benjamin Beganović
1a4543bc0c Support for payment_intent.succeeded event 2021-09-20 08:11:05 +02:00
David Bomba
a51436f224
Merge pull request #6600 from beganovich/v5-659 
Statements in client portal
 2021-09-20 11:43:45 +10:00
Linus Metzler
c7c7feaf9d
add missing semicolon 2021-09-19 15:09:44 +02:00
=
fb61138e73 Square Payment DriveR 2021-09-19 21:10:27 +10:00
David Bomba
6a0569869f Utilize lazy json inspection when importing 2021-09-19 12:40:46 +10:00
=
93b7959a78 refactor for json parsing 2021-09-18 23:20:16 +10:00
=
6d27613841 Minor fixes for designs 2021-09-18 18:37:08 +10:00
David Bomba
617703b405 Set company as a reference for Company Export 2021-09-18 17:55:34 +10:00
=
85f2b6a5df Default Design 2021-09-18 15:22:47 +10:00
=
70f16d9cf1 Fixes for company export 2021-09-18 14:50:15 +10:00
=
1f2aa60bee Fixes for company export 2021-09-18 14:49:43 +10:00
=
8c96296f29 Fixes for company export 2021-09-18 14:48:13 +10:00
=
e1b052a843 Minor Fixes 2021-09-18 09:26:28 +10:00
=
6696d2ba36 Add recurring_expense property if it doesn't exist. 2021-09-18 08:10:44 +10:00
=
b6b4ca0267 minor fixes 2021-09-18 07:59:04 +10:00
Benjamin Beganović
b21a27373d Generate PaymentIntent for payment requests 2021-09-17 21:00:59 +02:00
Benjamin Beganović
672c832b9b Hipster: Show statement label 2021-09-17 20:06:41 +02:00
Benjamin Beganović
926a599e8d Push $amount as last column 2021-09-17 19:49:40 +02:00
David Bomba
13f4ce365f update crons 2021-09-17 19:32:44 +10:00
=
ec74eb7bdd fixes for company settings casts 2021-09-17 17:52:22 +10:00
=
c7b9c582a2 Merge branch 'recurring_expenses' into v5-develop 2021-09-17 17:34:01 +10:00
Benjamin Beganović
6a8175b42d Fixes for $balance / $outstanding 2021-09-16 17:26:58 +02:00
Benjamin Beganović
5d5a87bc20 Fixes for invoices total amount 2021-09-16 17:21:25 +02:00
Benjamin Beganović
a87fb36cf1 Fixes for showing non-range invoices 2021-09-16 15:04:24 +02:00
Benjamin Beganović
dd7edcff41 Clean up 2021-09-16 14:21:29 +02:00
David Bomba
a4aa9bacd4 clean up 2021-09-16 17:40:54 +10:00
David Bomba
0e33d3f03f Add Direct Statics Controller 2021-09-16 13:38:16 +10:00
=
5066fbdac7 fixes for Invoice Balance Sanity 2021-09-16 08:43:14 +10:00
=
698bf5dde3 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-09-16 08:33:21 +10:00
=
6f3a1a2d06 Fixes for auth.net 2021-09-16 08:33:08 +10:00
Benjamin Beganović
7be7d2a9da Rendering PDF stream in client portal 2021-09-15 17:23:07 +02:00
Benjamin Beganović
77f9c95139 Fixes for options key pushing 2021-09-15 17:21:31 +02:00
David Bomba
4802b0bdcf Remove pdf_variables as defaults 2021-09-15 19:54:42 +10:00
David Bomba
605c88a31e user agents 2021-09-15 15:58:02 +10:00
David Bomba
a3e0d57133 Add customer to sofort payments 2021-09-15 14:39:34 +10:00
David Bomba
25ac52d40d Add triggered actions to Quotes 2021-09-15 11:20:31 +10:00
David Bomba
fe1cf514d6 Fixes for tests 2021-09-15 11:12:36 +10:00
David Bomba
dc790559e9 Merge branch 'v5-develop' into recurring_expenses 2021-09-15 10:16:24 +10:00
David Bomba
bc473439fe Add user agent into meta tags 2021-09-15 10:15:14 +10:00
David Bomba
618027dcd8 Add gross line and subtotals 2021-09-15 10:00:29 +10:00
David Bomba
33c05b1ad0 Add exclusive taxes to line items 2021-09-15 09:02:25 +10:00
Benjamin Beganović
121e763e1a Scaffold components 2021-09-14 20:57:33 +02:00
Benjamin Beganović
69662cd4f7 Fixes for webhook accepting 2021-09-14 15:25:30 +02:00
David Bomba
8d733ed725
Merge branch 'v5-develop' into v5-develop 2021-09-14 22:02:06 +10:00
David Bomba
778cf73ad1 Fixes for Sofort 2021-09-14 22:01:28 +10:00
David Bomba
62c1e2488d
Merge pull request #6636 from beganovich/v5-686 
Braintree: Add MAID references
 2021-09-14 21:58:40 +10:00
Benjamin Beganović
ee884811a0 Clean up CreateStatementRequest 2021-09-14 13:55:41 +02:00
Benjamin Beganović
745a81d3c8 Update ClientStatementController 2021-09-14 13:55:33 +02:00
Benjamin Beganović
139ede5db0 Generate statemets using service 2021-09-14 13:55:24 +02:00
David Bomba
6496c98355
Merge pull request #6637 from beganovich/v5-687 
Stripe: Change accepted webhook type
 2021-09-14 20:19:57 +10:00
Benjamin Beganović
615002e6b0 Merge remote-tracking branch 'upstream/v5-develop' into v5-659 2021-09-14 11:40:40 +02:00
Benjamin Beganović
8dd09be143 Add website() to CompanyPresenter 2021-09-14 11:28:10 +02:00
David Bomba
02de2607e0 Fixes for recurring expenses 2021-09-14 18:52:54 +10:00
Benjamin Beganović
15eeb6d101 Change accepted webhook type 2021-09-13 17:10:59 +02:00
Benjamin Beganović
5b6f63464c Drop verificationMerchantAccountId from creating token 2021-09-13 16:40:14 +02:00
Benjamin Beganović
8a2d3a4958 Inject MAID in client token create & payment method create 2021-09-13 16:30:40 +02:00
David Bomba
1356b3d7ad Minor fixes for client request validation 2021-09-13 08:42:15 +10:00
David Bomba
f168895507 Add first/last names for available fields 2021-09-13 08:02:10 +10:00
David Bomba
afad466539 Updated swedish translations 2021-09-13 07:45:48 +10:00
=
3733853cd3 Minor fixes for deleted_at column on invoice 2021-09-12 22:17:40 +10:00
=
835f9b49ce Improve initial email flow 2021-09-12 20:35:56 +10:00
=
1a2efecfaa Minor fixes 2021-09-12 15:29:30 +10:00
=
c9121f6b22 Force .foss for OSS release 2021-09-12 14:55:52 +10:00
David Bomba
b6d3c7123a Generic exception renderer 2021-09-12 10:43:52 +10:00
David Bomba
180c5e9683 Fixes for stripe connect error messages 2021-09-12 10:39:05 +10:00
=
0810d55087 Minor fixes for import 2021-09-11 21:16:43 +10:00
=
10d2be40c4 Fixes for template engine 2021-09-11 17:02:57 +10:00
=
84c4c5b527 Fixes for ninja plan selector 2021-09-11 16:26:00 +10:00
=
af8f559466 Quote webhooks and default company setter 2021-09-11 13:02:03 +10:00
=
b38cd1ef32 Approve Quote Webhook 2021-09-11 12:51:34 +10:00
David Bomba
0d088df863
Merge pull request #6624 from beganovich/v5-681 
Show archived resources in the client portal
 2021-09-11 08:45:41 +10:00
David Bomba
098c0b8edc
Merge pull request #6623 from beganovich/v5-679 
Hide invoices with "Cancelled" status
 2021-09-11 08:45:18 +10:00
David Bomba
570ffad29e Fixes for settings check for type bool 2021-09-11 08:43:40 +10:00
Benjamin Beganović
a95f9e608a Show archived tasks 2021-09-10 21:50:23 +02:00
Benjamin Beganović
ec4fb0ae9d Show archived subscriptions 2021-09-10 21:49:44 +02:00
Benjamin Beganović
2d9730191f Show trashed documents 2021-09-10 21:49:17 +02:00
Benjamin Beganović
e6474b2d07 Show archived payment methods 2021-09-10 21:48:35 +02:00
Benjamin Beganović
b81f247de3 Show archived credits table 2021-09-10 21:48:09 +02:00
Benjamin Beganović
a41c77ffba Show archived quotes 2021-09-10 21:47:48 +02:00
Benjamin Beganović
fb21b6c423 Show archived recurring invoices 2021-09-10 21:47:28 +02:00
Benjamin Beganović
4aad406ab0 Hide invoices with "Cancelled" status 2021-09-10 21:42:46 +02:00
=
da9aebd642 Minor fixes for queries 2021-09-10 22:56:23 +10:00
=
c9f940e914 Fixes for initial queries 2021-09-10 22:49:57 +10:00
=
707fe1dfdc Minor fixes 2021-09-10 22:14:38 +10:00
=
6e86a14634 Minor fixes 2021-09-10 22:07:08 +10:00
David Bomba
b3209caa7e
Merge pull request #6619 from turbo124/v5-develop 
Remove tax_rates from companyuser model
 2021-09-10 21:54:26 +10:00
=
e0e8c4eed4 Remove tax_rates from companyuser model 2021-09-10 21:53:59 +10:00
David Bomba
00c21e766e
Merge pull request #6618 from turbo124/v5-develop 
Fixes for payfast
 2021-09-10 21:46:38 +10:00
David Bomba
bb3dc665f5
Merge pull request #6616 from beganovich/v5-braintree-token 
Braintree: Fixes for token returning
 2021-09-10 21:46:10 +10:00
=
ca807a447c Allow ZAR and USD using PayFast 2021-09-10 21:45:13 +10:00
=
42b3272920 Fixes for appends on tax_rates model 2021-09-10 21:40:49 +10:00
Benjamin Beganović
6f30c787d1 Return token if response is success 2021-09-10 13:17:33 +02:00
=
a84db2309a Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-09-10 20:16:29 +10:00
=
8f2f97a584 Add Tax Rates as default" 2021-09-10 17:13:07 +10:00
David Bomba
494ddc1624 Fixes for zoho payment imports 2021-09-10 15:34:17 +10:00
David Bomba
f3a3e63ccb fixes for client contact enforcement 2021-09-10 07:44:58 +10:00
=
03ec5e042d Stripe Connect Compatible refunds 2021-09-09 21:46:03 +10:00
=
4fca1c58e4 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-09-09 21:18:09 +10:00
=
b3b5793703 Fixes for MultiDB payment gateways 2021-09-09 21:18:04 +10:00
David Bomba
b0510ad680 Fixes for support message 2021-09-09 20:59:58 +10:00
David Bomba
42c27d1cac Fixes for Triggered Actions 2021-09-09 17:23:47 +10:00
David Bomba
c26d092346 Fixes for S3 2021-09-09 16:59:23 +10:00
David Bomba
f0eb912e07 fixes 2021-09-09 15:14:05 +10:00
David Bomba
1d4e36d2f1 Fixes for ubl 2021-09-09 14:00:05 +10:00
David Bomba
56af0f5721 Merge branch 'v5-stable' into v5-develop 2021-09-09 12:01:05 +10:00
David Bomba
711db89061 Fixes for auto archiving 2021-09-09 11:59:09 +10:00
=
066666f5bc Remove redundant logging 2021-09-08 20:20:58 +10:00
David Bomba
4d35ed3ce5 Add S3 clean up on hosted 2021-09-08 14:14:46 +10:00
David Bomba
1fb6030bc8 Fixes for check data 2021-09-08 13:55:45 +10:00
David Bomba
5e71af94be Fixes for repairing invitations 2021-09-08 13:45:10 +10:00
David Bomba
8f89397cde Fixes for document download in client portal 2021-09-08 12:23:26 +10:00
David Bomba
acaf554031 Fixes for postmark reporting 2021-09-08 11:04:50 +10:00
David Bomba
b12190e554 Add fixing of invitations into check data script 2021-09-08 09:29:20 +10:00
David Bomba
9458069abb Fixes for special character encoding 2021-09-08 07:05:53 +10:00
Benjamin Beganović
ce554f5fcd Add Statement to sidebar 2021-09-07 18:00:22 +02:00
Benjamin Beganović
9dececf08b Scaffold StatementController & update client.php 2021-09-07 17:56:35 +02:00
=
57602952e9 Set partial labels on invoices 2021-09-07 21:58:17 +10:00
David Bomba
671bb2808b Minor fixes for recurring invoice loading 2021-09-07 17:46:23 +10:00
David Bomba
ddc85d6f08 Minor fixes for hosted migrations 2021-09-07 17:36:57 +10:00
David Bomba
a4803459b3 Minor fixes 2021-09-07 17:28:25 +10:00
David Bomba
1ebff701fd Fixes for eager loading 2021-09-07 17:27:23 +10:00
David Bomba
ee3ba97fcb Fixes for ninja mailer error reporting 2021-09-07 16:18:07 +10:00
David Bomba
c9ea2ceaf3
Merge pull request #6593 from turbo124/v5-develop 
Add withTrashed() when searching for MultiDB users
 2021-09-07 16:01:06 +10:00
David Bomba
2bed8fc972 Trim emails 2021-09-07 15:12:12 +10:00
David Bomba
916c5e4da8 Trim all emails 2021-09-07 14:55:09 +10:00
David Bomba
02e8e6e000 Fixes for amounts when formatted with comma's 2021-09-07 13:57:55 +10:00
David Bomba
65bc26ab79 Start and Stop Recurring Expenses 2021-09-07 09:02:23 +10:00
David Bomba
6200f572e6
Merge pull request #6592 from turbo124/recurring_expenses 
Recurring expenses
 2021-09-07 07:23:48 +10:00
David Bomba
63e638f931
Merge pull request #6591 from beganovich/v5-672 
Show archived payments in client portal
 2021-09-07 07:06:59 +10:00
Benjamin Beganović
50b447dd20 Show archived payments 2021-09-06 18:14:00 +02:00
Benjamin Beganović
6ee51e87bc Tasks 2021-09-06 17:39:25 +02:00
Benjamin Beganović
f179831e06 Recurring invoices 2021-09-06 17:38:45 +02:00
Benjamin Beganović
d5326f4873 Quotes 2021-09-06 17:36:58 +02:00
Benjamin Beganović
bb8bee0304 Projects 2021-09-06 17:36:22 +02:00
Benjamin Beganović
218cf81922 Payments 2021-09-06 17:35:15 +02:00
Benjamin Beganović
778a48a699 Invoices 2021-09-06 17:34:27 +02:00
Benjamin Beganović
9acff982cc Expenses 2021-09-06 17:28:04 +02:00
Benjamin Beganović
a93fcdc588 My documents & credits 2021-09-06 17:26:42 +02:00
David Bomba
a2fbfbac10 Explicitly define the system log const 2021-09-06 15:48:31 +10:00
David Bomba
32b0479101 Fixes for quantity number in line items 2021-09-06 15:37:52 +10:00
David Bomba
e719c659ea Fixes for Zoho imports 2021-09-06 15:08:41 +10:00
David Bomba
79ef62fefb Fixes for System Log Filter types 2021-09-06 13:07:11 +10:00
David Bomba
d575fac950 Fixes for edge cases when applying :MONTH in invoice pdfs 2021-09-06 11:48:08 +10:00
David Bomba
b06d761c8e fixes for edge case when deleting a payment on a deleted invoice 2021-09-06 11:04:00 +10:00
David Bomba
de32d57b5b Working on testing scenarios 2021-09-06 09:37:35 +10:00
David Bomba
e914447097 Add withTrashed() when searching for MultiDB users 2021-09-06 08:21:22 +10:00
David Bomba
ddf6e94c43 Make client_id query filter a global filter option 2021-09-06 07:43:01 +10:00
David Bomba
8ee9261baa Minor fix for store request validation 2021-09-06 06:59:00 +10:00
David Bomba
857e56fef7
Merge pull request #6587 from turbo124/v5-develop 
Init token billing for Auth.net
 2021-09-05 21:24:37 +10:00
Benjamin Beganović
67f00214fa Wrap getting token in the try-catch block 2021-09-05 13:20:37 +02:00
=
67e0e84e38 Init token billing for Auth.net 2021-09-05 21:15:51 +10:00
David Bomba
831fbade7b
Merge pull request #6556 from beganovich/v5-654 
(v5) Redirect back to client portal page on error pages
 2021-09-05 20:43:14 +10:00
Benjamin Beganović
160370c362 Add router methods for invoice, credit & quote 2021-09-05 12:41:00 +02:00
David Bomba
c45f3fab40
Merge pull request #6585 from beganovich/v5-668 
Pass merchant account id to Braintree transactions
 2021-09-05 20:34:24 +10:00
Benjamin Beganović
146cd8bc66 Process merchantAccountId with Braintree transactions 2021-09-05 12:31:17 +02:00
=
72bbcf2bb2 Prevent duplicate events firing on save 2021-09-05 20:31:08 +10:00
David Bomba
fb0403b104 Minor fixes for hosted migrations 2021-09-05 20:11:25 +10:00
David Bomba
b4d34f74cc move hosted migrations into correct folder 2021-09-05 20:07:10 +10:00
David Bomba
5454c931e6 Fixes for history on activity transformer 2021-09-05 19:46:47 +10:00
David Bomba
ff130ae8a2 Hosted Migration Console Command 2021-09-05 19:40:50 +10:00
David Bomba
bdb771e4ca Fixes for query logging 2021-09-05 15:48:15 +10:00
David Bomba
25d8b8b079 Fixes for eager loading 2021-09-05 14:03:21 +10:00
David Bomba
61b007e53a Minor adjustments for query logging 2021-09-05 09:15:21 +10:00
David Bomba
6bab442cc6 Fixes for company tokens on login 2021-09-05 09:01:17 +10:00
David Bomba
eb1547c187 Remove query count logs 2021-09-05 07:46:03 +10:00
David Bomba
268e4540b9 Add company gateways to mini load 2021-09-05 07:39:16 +10:00
David Bomba
74e94075b5 disable query logging 2021-09-04 17:49:42 +10:00
David Bomba
32dc4554c2 Fixes for eager loading with multiple groups 2021-09-04 17:28:08 +10:00