1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 23:22:52 +01:00
Commit Graph

2743 Commits

Author SHA1 Message Date
David Bomba
88dfa3601b Fixes for adding and restoring users 2021-11-06 10:28:48 +11:00
David Bomba
5f4e40162b working on users 2021-11-05 20:43:25 +11:00
David Bomba
916e20d902 fixes for add user count logic 2021-11-05 15:29:16 +11:00
David Bomba
50119240b9 Minor fixes for client country code rules 2021-11-01 16:12:10 +11:00
David Bomba
c57422617f Custom validation rules for client countries 2021-11-01 14:09:41 +11:00
David Bomba
7e23de8e5a fixes for refunding unapplied payments 2021-10-27 05:01:10 +11:00
David Bomba
f34d02a371 Minor fixes for create company 2021-10-26 20:39:33 +11:00
David Bomba
9c21e096a1 Update validation rules for update task status 2021-10-26 16:25:16 +11:00
David Bomba
8a85428532 Ensure recurring expenses have numeric for tax_amounts 2021-10-25 13:19:46 +11:00
David Bomba
e67fea2c33 Fixes for Company Switcher 2021-10-24 20:33:23 +11:00
David Bomba
3d319f1b1d Minor fixes for Contact login 2021-10-24 20:17:57 +11:00
David Bomba
5bd79c4046 Minor fixes for resolution of backup HTML documents 2021-10-24 19:27:12 +11:00
David Bomba
ebc58a18bb Minor fixes 2021-10-24 15:14:36 +11:00
David Bomba
31ef397dba Return early 2021-10-23 15:04:20 +11:00
David Bomba
8dcdccb9c7 Tests for custom validation rules 2021-10-23 12:07:54 +11:00
David Bomba
f270fbe2d6 Throw exception on paytrace failure 2021-10-23 11:45:22 +11:00
David Bomba
7a267b4406 Custom validation rule for amount 2021-10-23 10:16:43 +11:00
David Bomba
2bc8146f7c Fixes for contact authentication + viewed entity notifications 2021-10-23 10:06:30 +11:00
David Bomba
b92f16bfe5 Minor fixes for subscriptions 2021-10-22 10:55:58 +11:00
David Bomba
b915cc32c3
Merge pull request #6879 from turbo124/v5-develop
Refactor Refunds
2021-10-22 07:06:20 +11:00
Benjamin Beganović
56761b7585 Merge remote-tracking branch 'upstream/v5-develop' into gocardless-direct-debit 2021-10-21 14:40:45 +02:00
David Bomba
ca1e4d8ec7 Minor fixes for test PDF 2021-10-21 22:05:23 +11:00
David Bomba
0444c96a47 Subscription calculations 2021-10-21 21:44:18 +11:00
David Bomba
5579cee330
Merge pull request #6876 from turbo124/v5-develop
Refactor for backup storage location
2021-10-21 08:20:11 +11:00
David Bomba
f05fb9938e Fixes for adding users 2021-10-20 14:35:28 +11:00
David Bomba
ae3edef16c Refactor for backup storage location 2021-10-20 14:05:46 +11:00
David Bomba
4b728c3dd9 Reset all counters to 1 after company purge 2021-10-20 10:52:51 +11:00
David Bomba
f7fae98438 Set default design to Clean 2021-10-20 09:51:33 +11:00
David Bomba
2b5c58f607 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-10-20 07:58:20 +11:00
David Bomba
86d4f5e7ea Fixes for Swagger + Group Settings Documents 2021-10-20 07:58:14 +11:00
Benjamin Beganović
0d20e75636 Allow GatewayType\SEPA to show on methods page 2021-10-19 18:05:27 +02:00
Benjamin Beganović
a9ac839fc9
Merge branch 'v5-develop' into gocardless-direct-debit 2021-10-19 16:29:50 +02:00
Benjamin Beganović
98d2a4a407 Support for DIRECT_DEBIT on authorization pages 2021-10-19 15:37:23 +02:00
David Bomba
26f0bcede2 Prettify URL 2021-10-19 20:35:06 +11:00
David Bomba
0c23c058c5
Merge pull request #6865 from turbo124/v5-develop
Fixes for converting quotes to invoices - invitations
2021-10-19 20:04:45 +11:00
David Bomba
5f8b03cc58 minor fixes 2021-10-18 21:46:26 +11:00
David Bomba
fa2fedcef8
Merge pull request #6514 from Mause/patch-2
(v5) Declare request body for POST /api/v1/invoices
2021-10-18 15:24:42 +11:00
Elliana May
daa5bdb2b7
Remove newline 2021-10-18 12:17:38 +08:00
Elliana May
1c00b89d52
Update $ref to FillableInvoice 2021-10-18 12:17:07 +08:00
Elliana May
9df00d68c0
Create FillableInvoiceSchema.php 2021-10-18 12:16:29 +08:00
David Bomba
68a8715c6d Fixes for tests 2021-10-17 14:21:13 +11:00
David Bomba
ba2f78dad0 Refactor counter/patterns to allow User variables 2021-10-17 13:49:32 +11:00
David Bomba
653dbc5acc Filter account deletion emails 2021-10-16 12:19:27 +11:00
David Bomba
c26afd69e2 Fixes for Payment Webhooks 2021-10-15 18:47:41 +11:00
David Bomba
e319af89d9 Fixes for invitations 2021-10-14 18:58:13 +11:00
David Bomba
91333a50f3 Fixes for invitations 2021-10-14 18:54:17 +11:00
David Bomba
dc116013d9 Fixes for observers 2021-10-14 17:54:38 +11:00
David Bomba
0cfe5bc39a Refactor invitations 2021-10-14 16:25:09 +11:00
David Bomba
105e6282be logging 2021-10-13 16:47:53 +11:00
David Bomba
bd6e6a959a Add triggered actions to recurring invoices 2021-10-13 16:41:11 +11:00
David Bomba
fb7f44615d Minor fixes 2021-10-13 15:47:56 +11:00
David Bomba
1fbbaaad4d Minor N+1 fixes 2021-10-13 14:44:10 +11:00
David Bomba
05a6544898 Set default designs 2021-10-13 14:04:14 +11:00
David Bomba
62058e910d Return fresh model instance 2021-10-13 09:10:44 +11:00
David Bomba
d9b7ffe9f1 N+1 for preview controller 2021-10-12 21:24:09 +11:00
David Bomba
ebca34503b Fixes for N+1 2021-10-12 20:45:15 +11:00
David Bomba
af8c56a1f1 Fixes for N+1 queries in Client Statements 2021-10-12 19:10:43 +11:00
David Bomba
3b8ef9ccd9 Minor fixes for credit - paid - to - dates 2021-10-12 15:49:05 +11:00
David Bomba
543288c525 Refactor PDF generation into common .env var 2021-10-11 13:19:38 +11:00
David Bomba
bf4768bd7b Minor fixes for designs 2021-10-10 19:33:48 +11:00
David Bomba
cf4316b5ab Allow disconnect from Stripe Connect 2021-10-09 18:07:05 +11:00
David Bomba
c2599076bd Fixes for settings Default Design 2021-10-08 21:46:57 +11:00
David Bomba
b85e35dd62
Merge pull request #6800 from turbo124/v5-develop
Fixes for deleted invoices showing in portal
2021-10-08 21:24:21 +11:00
David Bomba
ff50c6413f Fixes for deleted invoices showing in portal 2021-10-08 21:23:51 +11:00
David Bomba
9e1418cb11 performance improvements 2021-10-08 16:29:06 +11:00
David Bomba
e6be94ad22 Improve query efficiency 2021-10-08 16:03:26 +11:00
David Bomba
9c18ab7230 Improve query efficiency 2021-10-08 15:00:17 +11:00
Benjamin Beganović
fd3ea350a2 Show company logo on password reset page 2021-10-07 13:23:45 +02:00
David Bomba
eb7de25e64 payment links 2021-10-06 15:05:16 +11:00
David Bomba
ef11a2258d Add Pay Link Functionality 2021-10-06 14:47:17 +11:00
David Bomba
9c1f82f632 Minor fixes for migration 2021-10-06 09:51:03 +11:00
David Bomba
81772cd3e8 Pay Now Link 2021-10-05 21:29:32 +11:00
David Bomba
2d791f26b7 Remove checks for send_email 2021-10-05 15:20:44 +11:00
David Bomba
8ce94012fb Credits fix 2021-10-05 13:49:15 +11:00
David Bomba
980f538e28 Fixes for displaying valid credits 2021-10-05 13:12:21 +11:00
David Bomba
7524bde1a6
Merge pull request #6766 from beganovich/v5-719
Customizable registration fields
2021-10-05 00:50:32 +11:00
David Bomba
16c88bc2cd
Merge pull request #6744 from beganovich/v5-gocardless-ach
GoCardless
2021-10-05 00:50:04 +11:00
Benjamin Beganović
61eddbb755 Handle dynamic fields on backend 2021-10-04 12:34:00 +02:00
David Bomba
e09bbfaaea Minor fixes 2021-10-04 09:36:30 +11:00
David Bomba
8005a1b7c7 Count auto bill items 2021-10-03 21:34:47 +11:00
David Bomba
0ef0cc9975 Minor fixes for PostMark Delivery 2021-10-03 15:57:15 +11:00
David Bomba
f0b51b7949
Merge pull request #6757 from turbo124/v5-develop
Fixes for Square
2021-10-03 13:38:00 +11:00
David Bomba
6c1ba6d40b Minor fixes for Square 2021-10-03 13:36:43 +11:00
Yannik Firre
0ef476411b
FIXED - Phantomjs Key 2021-10-01 12:23:51 +02:00
David Bomba
b28d76d491 Minor fixes 2021-10-01 08:55:35 +10:00
Benjamin Beganović
f4ddc5a974 Hide archived payment methods 2021-09-30 08:02:58 +02:00
David Bomba
f615b7801d Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-09-30 08:14:53 +10:00
David Bomba
4fdd709e99 Default client registration fields 2021-09-30 08:14:48 +10:00
David Bomba
a7a76e806c Minor fixes 2021-09-30 08:13:48 +10:00
David Bomba
e250273787 Fixes for displaying defaults on preview 2021-09-29 21:42:25 +10:00
David Bomba
e63d9828f1 Implement future migration refactor for v4 when we upgrade to L6 2021-09-29 21:06:42 +10:00
David Bomba
ff6767b5e4 Catch bounces 2021-09-29 11:17:04 +10:00
David Bomba
0028010249
Merge pull request #6736 from turbo124/v5-develop
Email archived invoice
2021-09-28 16:13:19 +10:00
David Bomba
1163dba723 Fixes for emailing archived invoices 2021-09-28 16:12:50 +10:00
Benjamin Beganović
0043471008 Hide recurring invoices with is_deleted 2021-09-27 18:46:52 +02:00
David Bomba
4443b13218 Performance improvements for PDFs 2021-09-27 11:40:17 +10:00
David Bomba
d5e580b863 Add triggered actions to update route of quotes 2021-09-27 08:29:18 +10:00
David Bomba
8178cd4bac Add triggered actions to update route of invoices 2021-09-27 08:27:17 +10:00
David Bomba
f35ad6a5a3 Inline downloads for file resources 2021-09-27 08:03:11 +10:00
David Bomba
f725152434 Fixes for document inline display 2021-09-26 22:27:18 +10:00
David Bomba
0f001bb056 Adjust injection of flutter build 2021-09-26 18:44:41 +10:00
David Bomba
cf8a555e4b Minor fixes 2021-09-26 12:13:03 +10:00
David Bomba
9e0bcffd6e Ensure we translate 2021-09-24 08:50:50 +10:00
David Bomba
a93baadd1a Minor fixeS 2021-09-22 18:50:19 +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
4684c23667 Force defaults to show in preview 2021-09-21 13:04:23 +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
Benjamin Beganović
ed3d148e45 Update request body: Passing specific options 2021-09-20 14:54:44 +02:00
=
6c1b0c24d0 Add inline download capability 2021-09-20 21:16:28 +10: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
=
6d27613841 Minor fixes for designs 2021-09-18 18:37:08 +10:00
=
85f2b6a5df Default Design 2021-09-18 15:22:47 +10:00
=
c7b9c582a2 Merge branch 'recurring_expenses' into v5-develop 2021-09-17 17:34:01 +10:00
Benjamin Beganović
dd7edcff41 Clean up 2021-09-16 14:21:29 +02: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
Benjamin Beganović
7be7d2a9da Rendering PDF stream in client portal 2021-09-15 17:23:07 +02:00
David Bomba
605c88a31e user agents 2021-09-15 15:58:02 +10:00
David Bomba
25ac52d40d Add triggered actions to Quotes 2021-09-15 11:20:31 +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
Benjamin Beganović
121e763e1a Scaffold components 2021-09-14 20:57:33 +02: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ć
615002e6b0 Merge remote-tracking branch 'upstream/v5-develop' into v5-659 2021-09-14 11:40:40 +02:00
David Bomba
02de2607e0 Fixes for recurring expenses 2021-09-14 18:52:54 +10:00
David Bomba
1356b3d7ad Minor fixes for client request validation 2021-09-13 08:42:15 +10:00
=
c9121f6b22 Force .foss for OSS release 2021-09-12 14:55:52 +10:00
David Bomba
180c5e9683 Fixes for stripe connect error messages 2021-09-12 10:39:05 +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
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
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
=
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
c26d092346 Fixes for S3 2021-09-09 16:59:23 +10:00
David Bomba
8f89397cde Fixes for document download in client portal 2021-09-08 12:23:26 +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
David Bomba
ddc85d6f08 Minor fixes for hosted migrations 2021-09-07 17:36:57 +10:00
David Bomba
1ebff701fd Fixes for eager loading 2021-09-07 17:27:23 +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
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
8ee9261baa Minor fix for store request validation 2021-09-06 06:59:00 +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
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
David Bomba
0ba7d27a7e Fixes for client portal login with custom domains 2021-09-04 11:27:18 +10:00
David Bomba
0dc4d9567c Fixes for client portal login with custom domains 2021-09-04 11:09:34 +10:00
David Bomba
5d32638d48 Logging for Ninja Plan Controller 2021-09-03 23:24:18 +10:00
=
ddd93a2a66 fixes for failed payments 2021-09-02 21:33:44 +10:00
David Bomba
10ad4b6248 v5.3.5 2021-09-02 17:51:54 +10:00
David Bomba
dafff7006f Fixes for Stripe Import 2021-09-02 12:08:16 +10:00
=
5c609f91f1 Fixes for client portal login 2021-09-01 17:36:36 +10:00
=
f2756799d1 minor fixes 2021-09-01 17:01:39 +10:00
David Bomba
dc093aa1c8 minor fixes for ninja hosted 2021-09-01 15:03:01 +10:00
David Bomba
d36bb0dcbc minor fixes for ninja hosted 2021-09-01 14:36:22 +10:00
David Bomba
296cb0511b Fixes for hosted onboarding 2021-09-01 14:02:57 +10:00
David Bomba
700fd6bf99 Fixes for password protection route - always check if a password is presented! 2021-08-31 14:09:12 +10:00
David Bomba
ded9e25c02 Minor fixes for recurring invoices auto bill 2021-08-31 13:12:17 +10:00
David Bomba
b22831f42e Do no send emails to trashed contacts 2021-08-31 08:20:45 +10:00
David Bomba
04f8a89d75 Fixes for auto bill 2021-08-31 07:44:05 +10:00
=
9f6fdb74c4 Fixes for Payment URL 2021-08-30 22:04:51 +10:00
David Bomba
ae88b61e8d Fixes for uploading and downloading company imports 2021-08-30 15:35:37 +10:00
David Bomba
a17227f2ca Recurring Invoices query 2021-08-29 20:34:53 +10:00
David Bomba
97c58bcf70 fixes for refundS 2021-08-27 09:56:42 +10:00
Elliana May
5dfa240255
Declare request body for POST /api/v1/invoices
Related to https://github.com/invoiceninja/invoiceninja/issues/5473
2021-08-26 14:15:27 +08:00
David Bomba
bf690e5cb8 Minor fix for postmark 2021-08-26 13:02:54 +10:00
David Bomba
74b4ef5b13 Fixes for translations in emails 2021-08-25 20:53:13 +10:00
David Bomba
41faffb09f Add field on company table 2021-08-25 19:41:03 +10:00
David Bomba
8bcfeffb11 Remove redundant doc blocks 2021-08-25 12:15:47 +10:00
David Bomba
aa0f1b3bdf Client Statements 2021-08-25 12:03:58 +10:00
David Bomba
f29318d665 Client Statements 2021-08-25 11:41:07 +10:00
Benjamin Beganović
d86f54137e Pass dynamic design to ClientStatementController.php 2021-08-24 16:49:58 +02:00
Benjamin Beganović
bcd29b93e1 CreateStatementRequest.php 2021-08-24 15:31:40 +02:00
Benjamin Beganović
35bcb1d779 API endpoint for creating statements 2021-08-24 15:31:07 +02:00
Benjamin Beganović
c6bc102c6d Update client.statement route 2021-08-24 13:18:32 +02:00
Benjamin Beganović
792eb003e3 Clean up ClientStatementController 2021-08-24 12:43:44 +02:00
Benjamin Beganović
6d1916ea5c Remove statement method from ClientController 2021-08-24 12:43:06 +02:00
David Bomba
7fe6dea1d3 Recurring quotes 2021-08-24 15:56:12 +10:00
David Bomba
bab9f222ff Recurring Quotes Tests 2021-08-24 15:05:35 +10:00
David Bomba
ee855824db Recurring Quotes 2021-08-24 12:57:46 +10:00
David Bomba
a0f6afec0f Stubs for Recurring Expenses 2021-08-23 09:38:55 +10:00
=
36d5d505ba Fixes for wasm 2021-08-20 19:25:07 +10:00
=
1f360ed6d3 minor fixes 2021-08-20 19:14:27 +10:00
=
6027b98ba7 Fixes for custom flutter binary 2021-08-20 19:04:16 +10:00
Benjamin Beganović
22ce56b7c5 Add shouldUseToken(): bool to PaymentResponseRequest 2021-08-19 13:34:18 +02:00
David Bomba
9fcaaf6302 Autobill tweaks 2021-08-19 07:41:34 +10:00
David Bomba
5e9e28c146 Revert service worker changes 2021-08-18 08:04:31 +10:00
David Bomba
0c39ec65e0 Adjust updated_at for /refresh routes for is_large accounts 2021-08-17 20:49:31 +10:00
David Bomba
1d4b331123 Disconnect Stripe Connect 2021-08-17 14:01:11 +10:00
David Bomba
2144451c52 Handle multi db on return for Stripe Connect 2021-08-17 12:18:10 +10:00
David Bomba
2382281b00 Fixes for Stripe Verify 2021-08-15 15:49:36 +10:00
David Bomba
5f0efcffc5 Fixes for Stripe exceptions 2021-08-15 15:30:46 +10:00
=
383caa6439 Stripe Verify 2021-08-15 15:13:20 +10:00
David Bomba
7f37c10178 FIxes for client validation 2021-08-14 07:44:20 +10:00
David Bomba
8484b3e024 FIxes for client validation 2021-08-13 18:45:19 +10:00
David Bomba
0e951831a0 Add scheduler check to /update route 2021-08-13 08:02:51 +10:00
David Bomba
8dbbfce0a5
Merge pull request #6388 from beganovich/v5-611
(v5) Refactor webhooks
2021-08-12 21:18:41 +10:00
David Bomba
0aecc6da20 Check that contacts are an array 2021-08-12 14:35:25 +10:00
David Bomba
bc81043973 Fixes for Molli 2021-08-11 16:43:20 +10:00
David Bomba
ba8759af6f minor fixes 2021-08-11 09:16:35 +10:00
Benjamin Beganović
2ed6e7643d Redirect to url if next is available for key_login 2021-08-10 10:18:05 +02:00
Benjamin Beganović
fbe0d3e8bd Update references to process_markdown flag 2021-08-09 14:31:31 +02:00
David Bomba
bea7072f22 Clean up ifs 2021-08-09 08:59:28 +10:00
David Bomba
acfb3ac3af Minor fixes 2021-08-09 08:44:51 +10:00
David Bomba
f57c064d26 Fixes for spam complaints 2021-08-08 17:58:40 +10:00
David Bomba
7057ca30d6 Minor fixes for deleting payment methods 2021-08-07 15:08:29 +10:00
David Bomba
c224255621 Fixes for removing payment methods 2021-08-07 14:58:04 +10:00
David Bomba
e35709145a Fixes for preview 2021-08-06 18:02:32 +10:00
David Bomba
9d3867f818 Fixes for preview 2021-08-06 17:57:24 +10:00
David Bomba
cdc7c76c43 Fixes for preview 2021-08-06 17:53:52 +10:00
David Bomba
e9633c1be9 Fixes for preview 2021-08-06 17:52:10 +10:00
David Bomba
1195838ded Fixes for preview 2021-08-06 17:48:35 +10:00
David Bomba
acbb692150 Reorder DB transaction initialization 2021-08-06 17:35:52 +10:00
David Bomba
0e1f17c6ea
Merge pull request #6411 from turbo124/v5-develop
Fixes for missing documents
2021-08-06 17:31:34 +10:00
David Bomba
019427602c Fixes for preview 2021-08-06 17:30:54 +10:00
Benjamin Beganović
c25c7b3370 Add option to copy billing details on the client check page 2021-08-05 17:36:24 +02:00
David Bomba
6b5c4b5d48 Fixes for preview 2021-08-05 23:00:13 +10:00
David Bomba
4bc422f1aa Fixes for preview 2021-08-05 22:58:57 +10:00
David Bomba
9a55743e3b Fixes for preview 2021-08-05 22:55:40 +10:00
David Bomba
55c7c23475 Fixes for preview 2021-08-05 22:51:51 +10:00
David Bomba
26e22d5365 Fixes for preview 2021-08-05 22:48:10 +10:00
David Bomba
a32e1d11b6 Fixes for preview 2021-08-05 22:41:28 +10:00
David Bomba
a6aff62286 Fixes for preview 2021-08-05 22:39:09 +10:00
David Bomba
f4d7b1a631 Logging for Preview 2021-08-05 21:58:07 +10:00
David Bomba
8c5100dbdc Logging for Preview 2021-08-05 21:50:53 +10:00
David Bomba
435a0ffc23 Fixes for preview 2021-08-05 21:45:54 +10:00
David Bomba
ee78101d5a Minor fixes for live preview 2021-08-05 20:03:20 +10:00
David Bomba
56446fdd69 Set DB for live previews 2021-08-05 19:57:44 +10:00
David Bomba
d176370e10 Set DB for live previews 2021-08-05 19:55:33 +10:00
David Bomba
edf2e04422 Set DB for live previews 2021-08-05 19:52:38 +10:00
David Bomba
7c7e4f4437 Set DB for live previews 2021-08-05 19:50:25 +10:00
David Bomba
3411d7ae8b Set DB for live previews 2021-08-05 19:48:57 +10:00
David Bomba
be85175134 Set Recurring to draft if not being sent at time of creation 2021-08-05 09:06:13 +10:00
Benjamin Beganović
7ab6dbd1b7 Cleanup of PaymentWebhookRequest 2021-08-04 16:24:49 +02:00
Benjamin Beganović
6740e348a1 Refactor PaymentWebhookController 2021-08-04 15:44:43 +02:00
David Bomba
98e82f3ea6 slow down web hook requests if the are too fast for usgit status 2021-08-03 07:40:42 +10:00
Benjamin Beganović
99d686a845 Cleanup PaymentWebhookController 2021-08-02 14:47:20 +02:00
David Bomba
413719b72c Fixes for correct include for Design 2021-08-02 11:08:03 +10:00
Benjamin Beganović
8af3cfe737 Pay with credit card and save for future use 2021-07-30 14:36:14 +02:00
David Bomba
c298ab40fa Fixes for bulk invoice downloads 2021-07-30 10:37:32 +10:00
Benjamin Beganović
1e2e55c9e4 Credit card 3ds processing 2021-07-29 15:13:38 +02:00
David Bomba
e5260df7d4 minor fixes for handle reversal 2021-07-29 20:31:20 +10:00
David Bomba
22036654a5 minor fixes for handle reversal 2021-07-29 20:30:45 +10:00
David Bomba
8e41c801c8 minor fixes for handle reversal 2021-07-29 20:30:02 +10:00
David Bomba
6d8ac6aa35 Minor fixes 2021-07-29 13:37:23 +10:00
David Bomba
f7a31f9ed2 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-07-29 12:20:05 +10:00
David Bomba
b91af0dc69 Client Contact password reset links 2021-07-29 12:19:56 +10:00
David Bomba
e490b26dbc Fixes for locking 2021-07-28 16:14:10 +10:00
David Bomba
b57c35d5e1 Fixes for locking 2021-07-28 16:12:07 +10:00
David Bomba
b87421f769 Fixes for locking 2021-07-28 16:01:30 +10:00
David Bomba
1fa93ebb60 Metrics for live previews 2021-07-28 11:49:13 +10:00
David Bomba
b506c293ed Fixes for live preview 2021-07-28 08:54:40 +10:00
David Bomba
8b588a55a5 Fixes for live preview 2021-07-28 08:09:30 +10:00
David Bomba
cf7dfd5618 Fixes for connected accounts 2021-07-28 08:01:26 +10:00
David Bomba
f644a2b460 Fixes for live preview 2021-07-27 22:20:32 +10:00
David Bomba
284203401b Fixes for live preview 2021-07-27 19:38:40 +10:00
David Bomba
efad096dfb Fixes for live preview 2021-07-27 18:32:29 +10:00
David Bomba
f21a60c159 Fixes for live preview 2021-07-27 18:04:46 +10:00
David Bomba
9401c25cca Set preview number to null 2021-07-27 08:57:20 +10:00
David Bomba
f90115aa8e Fixes for incorrect confirmation codes 2021-07-27 08:45:46 +10:00
David Bomba
bc5b9ca2e6 Prevent connected accounts being linked to existing users 2021-07-27 08:33:44 +10:00
Benjamin Beganović
7dd7a6e4b1 Scaffold Mollie3dsController 2021-07-26 17:03:15 +02:00
David Bomba
0df3e4e5e7 Clean up 2021-07-26 09:57:55 +10:00
David Bomba
a28aa9f7ec Fixes for client portal enabled and content type 2021-07-26 08:22:29 +10:00
David Bomba
438180daca Reponse type 2021-07-25 22:44:29 +10:00
David Bomba
8cf9576496 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-07-25 22:42:15 +10:00
David Bomba
60452278b5 Minor fixes 2021-07-25 22:42:03 +10:00
=
8ea34e4f7f Protected subdomains 2021-07-25 21:51:41 +10:00
David Bomba
4f940e41b0 fixes for defaults when converting quotes to invoices 2021-07-25 18:05:53 +10:00
David Bomba
8a4230c81c Working on live preview 2021-07-25 16:23:10 +10:00
David Bomba
465fb71962 Remove time delays 2021-07-24 17:43:40 +10:00
David Bomba
0365fb35af Minor fixes 2021-07-24 17:37:19 +10:00
David Bomba
176fb66391 Tweak email delays 2021-07-24 11:34:09 +10:00
David Bomba
b5a8c60db5 Improve Company Gateway validation 2021-07-24 10:25:48 +10:00
David Bomba
8ac7ec8ef4 Fixes for validation rule 2021-07-23 10:16:59 +10:00
David Bomba
62359e4097 minor fixes for wepay 2021-07-23 09:51:55 +10:00
David Bomba
dc3cf85e2c Fixes for Notifications 2021-07-22 20:15:41 +10:00
David Bomba
11ae85732b Fixes for queries 2021-07-20 19:45:54 +10:00
David Bomba
29006a2da0 Fixes for client - country codes 2021-07-20 15:09:02 +10:00
David Bomba
aff6eb2701 Fixes for bad country codes in client request 2021-07-20 14:53:43 +10:00
David Bomba
74551c2caf Add delete company email 2021-07-19 15:38:07 +10:00
David Bomba
d82491d163 Email user when another user is added into the system 2021-07-19 14:17:58 +10:00
David Bomba
bcc286e537 Handle base64 encoded passwords 2021-07-19 10:57:13 +10:00
David Bomba
edff2881eb Import Stripe Customers 2021-07-18 17:30:29 +10:00
David Bomba
a1e9de5807 Minor Clean up 2021-07-17 22:01:00 +10:00
David Bomba
8554c6cceb Working on improving hosted migration experience 2021-07-17 17:38:59 +10:00
=
a38dcbdd87 Streamline Hosted Migrations 2021-07-17 15:58:37 +10:00
David Bomba
da177661ec Fixes for subscriptions 2021-07-15 21:00:24 +10:00
David Bomba
97885557bd
Merge pull request #6272 from turbo124/v5-develop
Tests for settings
2021-07-15 13:04:05 +10:00
David Bomba
46bc8fa495 Fixes for subscription webhooks 2021-07-15 11:06:14 +10:00
Benjamin Beganović
033e74da7d Show 'No quotes avialable for download' instead of blank page 2021-07-14 14:33:17 +02:00
Benjamin Beganović
a9ac73264e Quotes page: Show message when trying to approve non-approvable quotes 2021-07-14 14:13:37 +02:00
Benjamin Beganović
f852640083
Merge pull request #6192 from beganovich/v5-client-portal-tests-dusk
Reworking client portal tests
2021-07-14 13:08:57 +02:00
David Bomba
d448ae1119 fixes for trial_started 2021-07-14 17:15:59 +10:00
David Bomba
332d376486 Fixes for Stripe ConnecT 2021-07-14 15:34:29 +10:00
David Bomba
4086203a81 Minor fixes for product and client bulk actions 2021-07-13 19:26:59 +10:00
Benjamin Beganović
2be806bb8e Merge remote-tracking branch 'upstream/v5-develop' into v5-client-portal-tests-dusk 2021-07-12 15:58:53 +02:00
David Bomba
a2d0965ed5 Fixes for plan_expires type casting 2021-07-11 14:54:57 +10:00
David Bomba
ad0b2b8ec3 Prevent ninja company from being deleted 2021-07-11 10:16:27 +10:00
David Bomba
6edfa0a966 Fixes for User model 2021-07-10 18:59:55 +10:00
David Bomba
a842cd31fe Fixes for Stripe 2021-07-09 10:44:34 +10:00
David Bomba
d1aae93c08 Fixes for Download Recurring Invoice 2021-07-09 09:49:01 +10:00
David Bomba
57bd1f9c9d Log excessively large queries 2021-07-09 09:08:20 +10:00
David Bomba
a6b2165eec Fixes for Stripe Connect - initial account 2021-07-09 09:05:24 +10:00
David Bomba
95767f8bdd Set Mime type of imported JSON file 2021-07-09 08:43:01 +10:00
David Bomba
87d0020152 Fixes for download invoices from client portal 2021-07-09 08:01:37 +10:00
David Bomba
108512068e Form validation for contact password reset 2021-07-09 07:57:31 +10:00
David Bomba
19bd957256 Dont forget to SET the user after OAuth SignUp 2021-07-08 12:51:17 +10:00
David Bomba
32036a8569 Fixes for PDF paths 2021-07-07 21:39:49 +10:00
David Bomba
52c0bcbc18 Inject small delay when sending emails 2021-07-07 18:43:34 +10:00
David Bomba
b15041f60b Fixes for portal domain 2021-07-07 13:19:19 +10:00
David Bomba
a1b7a795e0 Fixes for contact login logo for custom domains 2021-07-07 12:54:59 +10:00
Will G
a0520f38d0 Added ability to set arguments sent to Snappdf 2021-07-06 20:47:50 -04:00
Benjamin Beganović
3ee859a258 Profile settings: Updating contact details 2021-07-06 15:20:36 +02:00
Benjamin Beganović
13aec602e6 Add company_id, status_id in the query for approving 2021-07-05 14:00:27 +02:00
Benjamin Beganović
1a5c40d02e QuotesController: Allow approving only quotes with STATUS_SENT 2021-07-05 13:57:11 +02:00
David Bomba
e52f93be74 Fixes for base driver 2021-07-05 10:26:00 +10:00
David Bomba
620ad57d50 merging v5-dev 2021-07-05 09:00:46 +10:00
David Bomba
95bbc4108c Payfast custom notify URL 2021-07-05 08:59:52 +10:00
David Bomba
58547faf3e Fixes for client portal page 2021-07-04 20:53:32 +10:00
David Bomba
f6aebc5a8b Fixes for credits 2021-07-04 07:46:25 +10:00
David Bomba
3874bff357 Minor bug fixes 2021-07-03 09:26:49 +10:00
David Bomba
e8a1df16cd Fixes for credit query 2021-07-02 16:36:14 +10:00
David Bomba
e75d817bd4
Merge pull request #6182 from turbo124/v5-develop
Fixes for setup flow
2021-07-02 10:45:10 +10:00
David Bomba
ee729d8da0 fixes for setup flow 2021-07-02 10:43:32 +10:00
Benjamin Beganović
d763382d87
Merge pull request #6177 from beganovich/v5-3006-company-logo-login
Show logo on the login screen if account whitelabel or official subdomain
2021-07-02 02:23:51 +02:00
Benjamin Beganović
c972d8696d
Merge pull request #6179 from beganovich/v5-0106-credits-show-where-due-date
(Client portal) Show only credits with `due_date` <= now()
2021-07-02 02:23:31 +02:00
David Bomba
5bcbda2f47 Minor fixes for document downloads 2021-07-02 07:57:55 +10:00
David Bomba
32698b33d7 Document middleware 2021-07-02 07:23:25 +10:00
Benjamin Beganović
d0e59e1d27 Show only credits with due_date <= now() 2021-07-01 19:20:46 +02:00
Benjamin Beganović
e9d2d7d7f2 Show logo on the login screen if account whitelabel or official subdomain 2021-07-01 18:29:32 +02:00
David Bomba
69461104fe Fixes for client gateways 2021-07-01 15:56:44 +10:00
David Bomba
25459797db Add late fees back into reminders 2021-07-01 09:14:30 +10:00
Benjamin Beganović
1c05d51c7e
Merge pull request #6161 from beganovich/v5-2906-tasks-controlled-by-setting
(v5) Show tasks based on setting in the client portal
2021-06-30 02:01:06 +02:00
Benjamin Beganović
31e138c41e CreatePaymentMethodRequest.php allow only enabled methods to pass 2021-06-29 12:42:44 +02:00
Benjamin Beganović
1c96b358bf Show tasks based on setting in the client portal 2021-06-29 11:47:38 +02:00
David Bomba
a48328b90c Fixes for email translations 2021-06-29 19:46:40 +10:00
David Bomba
8e43eaa99d minor fixes 2021-06-29 17:26:21 +10:00
David Bomba
ac842d0d83 Fixes for subscriptions 2021-06-29 16:05:03 +10:00
David Bomba
0ef1a83300 Additional catches for company importing 2021-06-29 08:42:59 +10:00
David Bomba
11f13cba0d Minor fixes 2021-06-28 21:30:04 +10:00
Benjamin Beganović
77513de2a5 Make terms/privacy policy checkbox required if fields are present 2021-06-28 12:31:23 +02:00
David Bomba
4c00403d8c Fixes for contact registration 2021-06-28 19:56:04 +10:00
David Bomba
b654639ad3 Refactor for company import 2021-06-28 16:02:49 +10:00
David Bomba
24e8745b5b Fixes for company import 2021-06-28 14:09:02 +10:00
David Bomba
7d6676ca14 Fixes for missing include 2021-06-28 09:47:04 +10:00
David Bomba
d7e551fc95 Fixes for subscriptions 2021-06-27 21:55:15 +10:00
Benjamin Beganović
eb34cd81b1 Ability to toggle auto_bill_enabled on client side 2021-06-25 10:09:57 +02:00
Benjamin Beganović
cca78a9d38 Ability to select primary payment method 2021-06-25 09:15:57 +02:00
David Bomba
0c9de66a80 Set Transactions on the correct database 2021-06-24 21:52:02 +10:00
David Bomba
428a1a221c Minor fixes 2021-06-24 20:12:05 +10:00
David Bomba
c961d32c81 Minor fixes 2021-06-24 19:59:14 +10:00
David Bomba
28e3defc83 Fixes for dissociated default_company 2021-06-24 18:42:45 +10:00
David Bomba
1195c98660 Fixes for Two Factor 2021-06-23 15:01:13 +10:00
David Bomba
b56b5c1ec9 Fixes for Two Factor 2021-06-23 14:55:12 +10:00
David Bomba
24a5548619 Verify ACH amounts as integers 2021-06-23 08:14:23 +10:00
David Bomba
293b12e348 Fixes for login where the user is not attached to an account 2021-06-22 21:14:08 +10:00
David Bomba
8f78f93537 Log exact IP if reported by cloudflare 2021-06-22 10:51:43 +10:00
David Bomba
f258ccec16 force token_billing=always for system created gateways 2021-06-22 08:01:50 +10:00
David Bomba
1fb8e003b2 Fixes for sending message 2021-06-22 07:21:59 +10:00
David Bomba
1b303f9559 Fixes for subscription service 2021-06-21 20:53:34 +10:00
David Bomba
c9778463f6 Fixes for AAL license 2021-06-21 15:10:20 +10:00
David Bomba
f93aab5697 Fixes for Client Portal Download a single invoice 2021-06-21 12:58:52 +10:00
David Bomba
d43984385a Fixes for migration email 2021-06-21 07:09:42 +10:00
David Bomba
172604a1a0 WePay 2021-06-20 22:10:22 +10:00
David Bomba
1c052a7431 change user login event 2021-06-20 20:35:26 +10:00
David Bomba
5535ce8faf Allow archived invoices to be paid. 2021-06-20 08:14:56 +10:00
David Bomba
3982fcc2b0 Bug fix for saving report/user notifications for non-admin users 2021-06-20 07:34:30 +10:00
David Bomba
7ec71d886d
Merge pull request #6080 from turbo124/v5-develop
Working on gmail BCC
2021-06-18 22:04:42 +10:00
David Bomba
5cc3539388 Fix for no EmailBounce class 2021-06-18 12:57:13 +10:00
Benjamin Beganović
a502cee73e Enabled modules for InvoiceController.php 2021-06-17 14:43:14 +02:00
Benjamin Beganović
2d9bd6471b Update copyright in ShowTasksRequest.php 2021-06-17 14:38:16 +02:00
Benjamin Beganović
430d39b2f1 Enabled modules QuoteController.php 2021-06-17 14:37:06 +02:00
Benjamin Beganović
0d313f12b0 Enabled modules CreditController.php 2021-06-17 14:28:46 +02:00
Benjamin Beganović
a999534769 Enabled modules RecurringInvoiceController.php 2021-06-17 14:24:33 +02:00
Benjamin Beganović
77c03d4e8f Sync sidebar enabled modules with admin portal 2021-06-17 14:06:44 +02:00
David Bomba
b37d9d267e Fixes for broken invoice pdf links 2021-06-17 18:59:15 +10:00
David Bomba
c33a9d0ae5 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-06-17 17:28:12 +10:00
David Bomba
28b5d01804 minor change for subdomain regex 2021-06-17 07:29:03 +10:00
David Bomba
805d7f24d2 Minor fixes for InvoiceController PDF 2021-06-16 21:15:32 +10:00
David Bomba
2adb1728ea Fixes for license 2021-06-16 20:34:30 +10:00
David Bomba
c076998366 Wepay Payments 2021-06-16 20:12:04 +10:00
David Bomba
36f6cbbcc9 Update license in codebase 2021-06-16 16:58:16 +10:00
Benjamin Beganović
dfdb4b1cd9 Merge remote-tracking branch 'upstream/v5-develop' into v5-update-email-templates 2021-06-15 15:45:14 +02:00
David Bomba
177a4ce58f Working on authorization for WePay 2021-06-15 15:56:23 +10:00
David Bomba
95c9eb03a9 merge v5-dev 2021-06-14 20:47:03 +10:00
David Bomba
1397c9ab1c Fixes logic for hosted login 2021-06-14 17:04:15 +10:00
=
0bc3ec111d Authorize WePAy 2021-06-13 22:49:43 +10:00
=
46ae91f920 Fixes for regex for subdomain name 2021-06-13 20:47:49 +10:00
David Bomba
59fcbfe52c Don't delete the PDF prior to sending 2021-06-13 14:19:40 +10:00
David Bomba
0fb7f58851 code cleanup 2021-06-13 09:58:23 +10:00
=
afdfddd7e9 Refactor for entity paths 2021-06-12 21:50:01 +10:00
David Bomba
f268b7adcb Clean up 2021-06-11 17:45:41 +10:00
David Bomba
b111483ef1 We Pay Account Signup 2021-06-11 17:39:51 +10:00
David Bomba
c367ea60ae Timezone Offset implementation 2021-06-11 08:20:46 +10:00
David Bomba
1bc32c2aca Working on Timezone Offsets 2021-06-11 07:34:03 +10:00
=
99d6d1c516 Email timing offset 2021-06-10 21:25:47 +10:00
=
769ab49458 Force client country if none set 2021-06-10 20:18:01 +10:00
David Bomba
4675cc92b5 Inject delays in emails to allow enough time for attachment resources to upload when using S3 type storage 2021-06-10 19:01:30 +10:00
David Bomba
af68794823 Resolve access token from refresh token - gmail 2021-06-10 18:35:58 +10:00
David Bomba
4ef26723c1 Gmail offline_access 2021-06-10 17:38:07 +10:00
David Bomba
8a89973d7c Gmail offline_access 2021-06-10 17:17:02 +10:00
David Bomba
d1e92060bd Fixes for scopes 2021-06-10 16:57:18 +10:00
David Bomba
185986e819 Fix for missing method property 2021-06-10 15:06:28 +10:00
David Bomba
9c8618ac34 Oauth 2021-06-10 14:05:49 +10:00
Benjamin Beganović
15acba27dd app/Mail/ContactPasswordlessLogin.php 2021-06-09 17:07:41 +02:00
David Bomba
e4975e85bb Fixes for StoreUserRequest 2021-06-09 22:25:25 +10:00
David Bomba
f4bfa6c0fd Add rules for adding users to hosted platform 2021-06-09 19:57:03 +10:00
David Bomba
3d880f2dd3 Updates for Password Protection with OAuth 2021-06-09 16:22:25 +10:00
David Bomba
26a1e34268 Logging for Password Protection 2021-06-09 16:01:09 +10:00
David Bomba
0f58039532 Fixes for if plan is null 2021-06-08 22:29:39 +10:00
David Bomba
d68e40433c Fixes for client portal links 2021-06-08 21:45:23 +10:00
David Bomba
c2e2ab60cb Implement slight delay on Company Import 2021-06-08 18:58:27 +10:00