Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-15 23:52:33 +01:00
Code Issues Releases Activity
9,455 Commits 7 Branches 925 Tags 2 GiB
5f7de014b0
Commit Graph

5226 Commits

Author SHA1 Message Date
Benjamin Beganović
61eea4fde2 Fix issue with duplicated company fields 2021-06-24 17:18:02 +02:00
Benjamin Beganović
fa4aa83638
Merge pull request #6118 from beganovich/v5-2306-ach-improvements 
Add "complete verification" button in the ACH verification email
 2021-06-24 14:40:58 +02:00
David Bomba
0c9de66a80 Set Transactions on the correct database 2021-06-24 21:52:02 +10:00
David Bomba
74aa6d46d5 Fixes for client settings 2021-06-24 21:26:14 +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
3baa0e3d9a PayFast Webhook URL listener 2021-06-24 19:45:45 +10:00
David Bomba
a01df67427 Fixes for payfast driver 2021-06-24 18:43:51 +10:00
David Bomba
28e3defc83 Fixes for dissociated default_company 2021-06-24 18:42:45 +10:00
David Bomba
6f1593a35e Padding our DriverTemplate 2021-06-24 15:51:30 +10:00
David Bomba
15bdb3ff3c Payfast 2021-06-24 15:46:10 +10:00
David Bomba
50749cd2bb Payfast 2021-06-24 14:43:14 +10:00
David Bomba
6e212d7d55 Tweaks for company size check 2021-06-24 13:22:46 +10:00
David Bomba
f696f4926a
Merge pull request #6119 from turbo124/v5-develop 
V4 -> V5 compatiblity improvements
 2021-06-24 07:56:16 +10:00
David Bomba
77432954d3 V4 -> V5 compatiblity improvements 2021-06-24 07:55:29 +10:00
David Bomba
a0ffcd78f0 Strip Tags from Paypal noteS 2021-06-24 07:07:36 +10:00
David Bomba
bc427c97cf Catch all for designs 2021-06-24 06:55:33 +10:00
Benjamin Beganović
cb338141eb
Merge pull request #6116 from beganovich/v5-2306-swap-bottom-text-for-signature 
(v5) E-mail improvements
 2021-06-23 15:32:11 +02:00
David Bomba
7e6e1d3de0 Backward compatiblity for custom counters 2021-06-23 22:55:01 +10:00
Benjamin Beganović
28463ca565 Add "complete verification" button in the ACH verification email 2021-06-23 14:52:54 +02:00
David Bomba
fc1a605046 Minor fixes for WePay 2021-06-23 22:41:29 +10:00
Benjamin Beganović
71fff59e8e Fixes for signature & surcharge fields 2021-06-23 11:54:59 +02:00
Benjamin Beganović
724e3b8191 Fixes for correct email template selector 2021-06-23 11:00:43 +02:00
Benjamin Beganović
7f342b589d Remove unused method 2021-06-23 10:48:56 +02:00
Benjamin Beganović
38504e2d53 Skip post-table processing for emails 2021-06-23 10:46:51 +02:00
David Bomba
98aaf3028b Change payment exchange_currency_id from the clients currency to the company currency 2021-06-23 16:49:40 +10:00
David Bomba
dbfb4069f7 Fixes for Gmail BCC 2021-06-23 15:13:33 +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
4eea13334e Code cleanup 2021-06-23 13:03:47 +10:00
David Bomba
6af1ac9373 Fixes for Gmail BCC 2021-06-23 08:50:02 +10:00
David Bomba
83b798dba0 Refresh gmail tokens prior to emailing events 2021-06-23 08:31:22 +10:00
David Bomba
fee346e723 Fixes for mailers 2021-06-23 08:17:22 +10:00
David Bomba
49e1a13b53 Verify ACH amounts as integers 2021-06-23 08:15:03 +10:00
David Bomba
24a5548619 Verify ACH amounts as integers 2021-06-23 08:14:23 +10:00
David Bomba
5e4d70d69b Default shown tasks = invoiced 2021-06-23 07:54:06 +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
a76678e7b4 Fixes for check data script 2021-06-22 19:02:26 +10:00
David Bomba
756543f132 Change query parameter when querying datetimes 2021-06-22 18:46:46 +10:00
David Bomba
a04be52615 Cross fill subdomains 2021-06-22 17:45:55 +10:00
David Bomba
2da5ac6caa Subdomain filling 2021-06-22 17:24:14 +10:00
David Bomba
12d040e163 Fixes for query 2021-06-22 11:13:01 +10:00
David Bomba
8f78f93537 Log exact IP if reported by cloudflare 2021-06-22 10:51:43 +10:00
David Bomba
a3a406b122 Set Exchange Rates on invoice when marked as paid 2021-06-22 08:41:15 +10:00
David Bomba
823d23df24 Set exchange rates on invoices/payments when marking as paid 2021-06-22 08:39:08 +10:00
David Bomba
f258ccec16 force token_billing=always for system created gateways 2021-06-22 08:01:50 +10:00
David Bomba
e4fdfaef45 Fixes for support messages 2021-06-22 07:29:04 +10:00
David Bomba
644a261e44
Merge pull request #6097 from turbo124/v5-develop 
Fixes for sending message
 2021-06-22 07:22:18 +10:00
David Bomba
1fb8e003b2 Fixes for sending message 2021-06-22 07:21:59 +10:00
Benjamin Beganović
8a3f06c039
Merge pull request #6090 from beganovich/v5-2106-change-default-email-logo 
(v5) Change default company logo
 2021-06-21 14:22:35 +02:00
David Bomba
1b303f9559 Fixes for subscription service 2021-06-21 20:53:34 +10:00
David Bomba
cd82ce0764 Log Reminders 2021-06-21 15:57:14 +10:00
David Bomba
c9778463f6 Fixes for AAL license 2021-06-21 15:10:20 +10:00
Benjamin Beganović
ea9d071004 Update default company logo 2021-06-21 07:01:15 +02:00
David Bomba
f93aab5697 Fixes for Client Portal Download a single invoice 2021-06-21 12:58:52 +10:00
David Bomba
452808116a Import check data script 2021-06-21 08:18:30 +10:00
David Bomba
2f52b11dcd Fixes for support messages 2021-06-21 07:52:45 +10:00
David Bomba
d43984385a Fixes for migration email 2021-06-21 07:09:42 +10:00
David Bomba
8b9b30ff63 Set payment exchange rate 2021-06-21 06:55:48 +10:00
David Bomba
2aad520733 Fixes for Payment Fillables 2021-06-21 06:51:42 +10:00
David Bomba
172604a1a0 WePay 2021-06-20 22:10:22 +10:00
David Bomba
a58db2100c REfunds for wepay 2021-06-20 22:04:12 +10:00
David Bomba
1c052a7431 change user login event 2021-06-20 20:35:26 +10:00
David Bomba
4173cb6903 WePay 2021-06-20 20:24:11 +10:00
David Bomba
f2da4d7985 Delete credit cards from wepay 2021-06-20 16:53:33 +10:00
David Bomba
4eda6b1190 Refactor common code WePay 2021-06-20 16:24:37 +10:00
David Bomba
2075c4e8c1 Testing WePay payment with Credit Card 2021-06-20 13:36:58 +10:00
David Bomba
1cea863e77 Fixes for credit card payment 2021-06-20 13:06:17 +10:00
=
886e006de7 Handle payment success/failure with WePay 2021-06-20 09:57:19 +10:00
David Bomba
5535ce8faf Allow archived invoices to be paid. 2021-06-20 08:14:56 +10:00
David Bomba
0772c05e66 Fixes for address presentation for clients 2021-06-20 07:55:47 +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
e63a7f9875 WePay checkout 2021-06-19 17:31:05 +10:00
David Bomba
d90b884922 WePay process credit/card 2021-06-19 14:58:45 +10:00
David Bomba
3911a58d98 WePay JS 2021-06-19 14:05:45 +10:00
David Bomba
7e1d4376a2 Fixes for create invitations 2021-06-19 13:09:22 +10:00
=
d16895401c Handle Wepay Events 2021-06-19 11:47:36 +10:00
=
6435725d0f Payment layout for wepay credit card 2021-06-19 11:18:57 +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ć
353fd1cb39
Merge pull request #6072 from beganovich/v5-1706-sync-enabled-modules 
(v5) Sync enabled modules with admin portal
 2021-06-17 15:58:53 +02:00
David Bomba
9efc561fc8 Working on gmail BCC 2021-06-17 23:13:49 +10:00
David Bomba
57f85e1acf Fixes for BCC list 2021-06-17 22:47:34 +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
cf1d7963e1 Fixes for BCC list 2021-06-17 22:06:08 +10:00
David Bomba
0d2cf66776 Fixes for BCC list 2021-06-17 21:55:56 +10:00
David Bomba
966939a843 Fixes for BCC list 2021-06-17 20:49:49 +10:00
David Bomba
8513f1408d Fixes for BCC list 2021-06-17 20:01:34 +10:00
David Bomba
4031606de4 Fixes for broken invoice pdf links 2021-06-17 19:06:11 +10:00
David Bomba
b37d9d267e Fixes for broken invoice pdf links 2021-06-17 18:59:15 +10:00
David Bomba
907f55dec6 Fixes for MailServiceProvider 2021-06-17 18:53:45 +10:00
David Bomba
0cf76259df Fixes for MailServiceProvider 2021-06-17 18:47:14 +10:00
David Bomba
a059924ca2 Fixes for conflicts 2021-06-17 18:44:07 +10:00
David Bomba
63242a62c1 Fixes for conflicts 2021-06-17 18:39:09 +10:00
David Bomba
1cda49e6bb Fixes for conflicts 2021-06-17 18:20:03 +10:00
David Bomba
79c598b13d Fixes for conflicts 2021-06-17 17:59:02 +10:00
David Bomba
8c06eaa5ae Fixes for mail drivers 2021-06-17 17:48:23 +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
cdd074f000 Fixes for postmark bindings 2021-06-17 14:34:01 +10:00
David Bomba
6ac714960a Fixes for postmark bindings 2021-06-17 14:29:39 +10:00
David Bomba
4be5d8783e Fixes for postmark bindings 2021-06-17 13:36:23 +10:00
David Bomba
eb3d3ca858 Fixes for mail providers 2021-06-17 12:57:47 +10:00
David Bomba
183e8ac36f Minor fixes for paths in hosted 2021-06-17 11:22:11 +10:00
David Bomba
119b07fe03
Merge pull request #6051 from turbo124/v5-develop 
minor change for subdomain regex
 2021-06-17 08:39:28 +10:00
David Bomba
28b5d01804 minor change for subdomain regex 2021-06-17 07:29:03 +10:00
Benjamin Beganović
85ebc15065 Remove deprecated method from SubscriptionService 2021-06-16 16:31:56 +02:00
Benjamin Beganović
fc51a89dcb Hide custom surcharges if they're 0 2021-06-16 16:09:30 +02: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
ce0cd5ddb1 Fixes for conflicts 2021-06-16 20:21:08 +10:00
David Bomba
f4d686c70c Fixes for conflicts 2021-06-16 20:16:22 +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
David Bomba
43ff685543 WePay authorize for Bank Transfer 2021-06-16 16:41:29 +10:00
David Bomba
d4f27bb3ee WePay authorize for Bank Transfer 2021-06-16 13:26:33 +10:00
David Bomba
8c36ba78b1
Merge pull request #6034 from beganovich/v5-update-email-templates 
(v5) New e-mail templates
 2021-06-16 13:11:04 +10:00
Benjamin Beganović
3f729bedde Throw PaymentFailed (generic) exception 2021-06-15 18:52:15 +02:00
Benjamin Beganović
dfdb4b1cd9 Merge remote-tracking branch 'upstream/v5-develop' into v5-update-email-templates 2021-06-15 15:45:14 +02:00
Benjamin Beganović
01e7e3271e Adapt templates for dynamic emails 2021-06-15 15:42:37 +02:00
David Bomba
3a5cd34f83 Fixes for company exporter 2021-06-15 23:11:45 +10:00
David Bomba
ca7631e950 Minor fixes for company exporter 2021-06-15 23:08:59 +10:00
David Bomba
8fd4a3f202 Authorize credit card 2021-06-15 21:37:16 +10:00
David Bomba
177a4ce58f Working on authorization for WePay 2021-06-15 15:56:23 +10:00
David Bomba
31c8eb1a19 Fixes for stripe import customers 2021-06-15 11:09:12 +10:00
David Bomba
8a217358a8 Fixes for model binding in livewire 2021-06-15 09:47:10 +10:00
David Bomba
d582e67962 Fixes for Stripe import customers 2021-06-15 08:19:23 +10:00
David Bomba
887bc3d4a6 Fixes for reminders 2021-06-15 08:06:01 +10:00
Benjamin Beganović
2bc83aff27 CSS inliner plugin 2021-06-14 14:50:28 +02:00
David Bomba
95c9eb03a9 merge v5-dev 2021-06-14 20:47:03 +10:00
David Bomba
2e1a6ef6c4 HostedUsers console command 2021-06-14 18:10:46 +10:00
David Bomba
7469ca30eb HostedUsers console command 2021-06-14 18:06:34 +10:00
David Bomba
d2d6a9fe5a Changes to CompanyImport logic - allow multiple users to be imported - however we prevent them from logging in if their plan isn't Enterprise 2021-06-14 17:09:05 +10:00
David Bomba
1397c9ab1c Fixes logic for hosted login 2021-06-14 17:04:15 +10:00
=
c67998219e invoice_total_raw 2021-06-13 22:56:33 +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
=
62811d968b WePay 2021-06-13 20:37:37 +10:00
=
2b6f0870b3 Tests for clean up S3 orphans 2021-06-13 20:09:52 +10:00
David Bomba
a42223a0be Clean up filesystem: 2021-06-13 19:44:33 +10:00
David Bomba
59fcbfe52c Don't delete the PDF prior to sending 2021-06-13 14:19:40 +10:00
David Bomba
0a0ea46851 Declare disk for storage 2021-06-13 14:09:33 +10:00
David Bomba
55918d772c Specify disk for storage operations 2021-06-13 13:57:08 +10:00
David Bomba
7709bd32d1 Ensure directories are created prior to PDF generation 2021-06-13 10:18:07 +10:00
David Bomba
0fb7f58851 code cleanup 2021-06-13 09:58:23 +10:00
Benjamin Beganović
a2fe0cbb6a SupportMessageSent 2021-06-12 23:19:56 +02:00
Benjamin Beganović
8493b2e4d6 ImportCompleted email 2021-06-12 23:14:28 +02:00
Benjamin Beganović
5af9cc828f Passwordless login 2021-06-12 23:12:06 +02:00
=
afdfddd7e9 Refactor for entity paths 2021-06-12 21:50:01 +10:00
David Bomba
edf2dfcc80 Minor fixes 2021-06-12 19:40:28 +10:00
David Bomba
3954ac3f3a Fixes for timezone offsets 2021-06-12 07:41:02 +10:00
Benjamin Beganović
4cba96d973 ACHVerificationNotification: 
- Pass $company into view
- Update view to use client layout
- Fixes for client layout / whitelabel handling
 2021-06-11 15:52:28 +02:00
David Bomba
a441b3f79e Working on authorization 2021-06-11 18:30:39 +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
86be7c6690 add ninja_portal_url to company_user transformer 2021-06-11 14:16:21 +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
Benjamin Beganović
fd58f1cadb Construct client template & ClientContactResetPasswordObject.php 2021-06-10 11:23:10 +02: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
f28ba178ee Fix for missing method property 2021-06-10 14:32:53 +10:00
David Bomba
4280d5ab0c Fixes for Google Oauth 2021-06-10 14:25:01 +10:00
David Bomba
9c8618ac34 Oauth 2021-06-10 14:05:49 +10:00
David Bomba
821ed8678e Catch missing cache items 2021-06-10 13:56:02 +10:00
David Bomba
887c9a8eab Minor fixes 2021-06-10 12:24:32 +10:00
David Bomba
a5054f87a5 Fixes for endless reminders 2021-06-10 11:15:21 +10:00
Benjamin Beganović
e70effd404 app/Mail/MigrationFailed.php 2021-06-09 17:25:59 +02:00
Benjamin Beganović
32fc72913b app/Mail/ExistingMigration.php 2021-06-09 17:16:16 +02:00
Benjamin Beganović
e86463a27e app/Mail/DownloadInvoices.php 2021-06-09 17:14:27 +02:00
Benjamin Beganović
795a666885 app/Mail/DownloadBackup.php 2021-06-09 17:09:46 +02:00
Benjamin Beganović
15acba27dd app/Mail/ContactPasswordlessLogin.php 2021-06-09 17:07:41 +02:00
Benjamin Beganović
40f22e7839 Remove app/Mail/BouncedEmail.php 2021-06-09 17:01:42 +02:00
Benjamin Beganović
02c443fe33 app/Mail/User/UserNotificationMailer.php 2021-06-09 17:00:35 +02:00
Benjamin Beganović
9c45111a4e app/Mail/User/UserLoggedIn.php 2021-06-09 16:57:16 +02:00
Benjamin Beganović
dcc51ba6a6 app/Mail/RecurringInvoice/ClientContactRequestCancellationObject.php 2021-06-09 16:54:46 +02:00
Benjamin Beganović
973bdfcb35 app/Mail/Import/ImportCompleted.php 2021-06-09 16:47:11 +02:00
Benjamin Beganović
ae66496711 app/Mail/Gateways/ACHVerificationNotification.php 2021-06-09 16:38:24 +02:00
Benjamin Beganović
d3fcb77e49 app/Mail/ClientContact/ClientContactResetPasswordObject.php 2021-06-09 16:09:09 +02:00
Benjamin Beganović
ee4be6d84a Accept view() instead of markdown() in NinjaMailer 2021-06-09 16:08:55 +02:00
David Bomba
e4975e85bb Fixes for StoreUserRequest 2021-06-09 22:25:25 +10:00
David Bomba
7627d3566d Improve query efficiency 2021-06-09 20:19:23 +10:00
David Bomba
f4bfa6c0fd Add rules for adding users to hosted platform 2021-06-09 19:57:03 +10:00
David Bomba
b1cc872dcd Fixes for injecting Task Statuses in import data 2021-06-09 16:38:36 +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
ada4777a57 Check DB script 2021-06-09 14:37:02 +10:00
David Bomba
cd1062cff9 Check DB script 2021-06-09 14:27:48 +10:00
David Bomba
2bbfa72288 Console command to check Multi DB 2021-06-09 13:47:26 +10:00
David Bomba
34e24d2a0a Debugging Company Import 2021-06-09 13:17:55 +10:00
David Bomba
a753d6ca5a Create Ninja User on hosted platform 2021-06-09 12:24:32 +10:00
=
f93a92bde9 Prevent Docker from restarting the queues 2021-06-09 10:27:01 +10:00
David Bomba
9231c29d69 Additional logic for importing data into the hosted platform 2021-06-09 08:19:00 +10:00
David Bomba
9585974b66 Fixes for import json 2021-06-08 22:58:46 +10:00
David Bomba
f7e91cabd4 Fixes for importjson 2021-06-08 22:44:38 +10:00
David Bomba
0f58039532 Fixes for if plan is null 2021-06-08 22:29:39 +10:00
David Bomba
8170c395b4 Fixes for if plan is null 2021-06-08 22:17:19 +10:00
David Bomba
5be8910c38 Additional logging 2021-06-08 22:05:18 +10:00
David Bomba
d68e40433c Fixes for client portal links 2021-06-08 21:45:23 +10:00
David Bomba
b629b9dcba Better logging for company importer 2021-06-08 20:39:07 +10:00
David Bomba
c2e2ab60cb Implement slight delay on Company Import 2021-06-08 18:58:27 +10:00
David Bomba
12a31b79e7 Better logging for company importer 2021-06-08 18:54:34 +10:00
David Bomba
5d04ab724b Fixes for login 2021-06-08 18:42:37 +10:00
David Bomba
968f512aec Fixes for orphan users with no tokens 2021-06-08 18:30:54 +10:00
David Bomba
215d459a0c Fixes for pre flight checks: 2021-06-08 15:59:08 +10:00
David Bomba
b8db1d5d22 Fixes for pre flight checks: 2021-06-08 15:05:51 +10:00
David Bomba
aca8e1550e Fixes for pre flight checks: 2021-06-08 13:45:19 +10:00
David Bomba
7c7e6db875 Assign public property to 2021-06-08 13:41:15 +10:00
David Bomba
fd7d55dba6 Assign public property to 2021-06-08 12:50:17 +10:00
David Bomba
3a272ad13b Assign public property to 2021-06-08 12:16:32 +10:00
David Bomba
31d5db06e3 Assign public property to 2021-06-08 12:08:07 +10:00
David Bomba
ca4fbabf7d Fixes for company import mailer 2021-06-08 11:02:32 +10:00
David Bomba
5540f690c0 Fixes for company import mailer 2021-06-08 10:42:48 +10:00
David Bomba
2e7de6c470 Fixes for Paypal 2021-06-08 10:29:43 +10:00
David Bomba
5854b9825f Fixes for Import 2021-06-08 08:33:51 +10:00
David Bomba
ce5f84b8c1 Fixes for Import 2021-06-08 08:09:13 +10:00
David Bomba
7ba2446a1d fixes for impotr 2021-06-08 07:51:21 +10:00
David Bomba
b9262e59fa Fixes for logging in company import 2021-06-08 07:46:00 +10:00
David Bomba
60e44c127c Fixes for logging in company import 2021-06-08 07:45:40 +10:00
David Bomba
b29c9f25e3 Company Import mailer 2021-06-08 07:23:20 +10:00
Benjamin Beganović
3aa18916bd Admin: migration / max_companies.blade.php 2021-06-07 18:12:11 +02:00
Benjamin Beganović
8b568d6147 Admin: DownloadInvoices / download_files.blade.php 2021-06-07 18:02:44 +02:00
David Bomba
1baadd96b4 Enforce client and user limits with Company Import 2021-06-07 15:50:09 +10:00
David Bomba
4b6d17fa8d Working on Company Import limiter 2021-06-07 15:42:39 +10:00
David Bomba
8a985c6954 Make all livewire components MultiDB aware 2021-06-07 11:06:31 +10:00
David Bomba
9fad98017b Update fr_CA langs 2021-06-07 08:41:04 +10:00
David Bomba
e631a72fb4 Fixes for test 2021-06-06 19:27:15 +10:00
David Bomba
ec6bf52b43 Add specific route for disabling 2FA 2021-06-06 19:21:05 +10:00
David Bomba
e03dec3ed2 Improve check data scripts 2021-06-06 10:09:55 +10:00
=
8703bcc5f6 Fixes for .register bug 2021-06-05 20:59:53 +10:00
=
e37613a5a1 Company Registration 2021-06-05 20:31:11 +10:00
=
e6eb899f79 Fixes for contact registration 2021-06-05 20:12:10 +10:00
David Bomba
2c4476675c Improve check data scripts 2021-06-05 16:11:42 +10:00
David Bomba
df56346c2b Improve check data scripts 2021-06-05 16:10:31 +10:00
David Bomba
a40e5d28d7 Improve check data scripts 2021-06-05 15:58:37 +10:00
David Bomba
f54a6b192e Fixes for import 2021-06-05 15:31:40 +10:00
David Bomba
ed5affeae4 Import 2021-06-05 15:03:47 +10:00
David Bomba
1b76dc4d97
Merge pull request #5923 from turbo124/v5-develop 
5.1.71
 2021-06-05 12:43:12 +10:00
David Bomba
2602144c7a 5.1.71 2021-06-05 12:42:56 +10:00
=
158f94993e Company Import 2021-06-04 21:39:35 +10:00
Benjamin Beganović
a55142acd9 Don't parse markdown for footer, public notes & terms 2021-06-04 13:28:12 +02:00
Benjamin Beganović
a52cdca1e3 Parse break lines inputs from user 2021-06-04 13:26:32 +02:00
Benjamin Beganović
bb45b5f55b Disable markdown processing for line items 2021-06-04 13:26:06 +02:00
=
50ab1a3bd7 Company Import 2021-06-04 20:42:25 +10:00
=
6bc26c476b Company Import 2021-06-04 20:32:43 +10:00
=
fe2c410ef7 Company Import 2021-06-04 20:20:10 +10:00
=
a2e994be82 Company Import 2021-06-04 20:07:45 +10:00
David Bomba
b75c01d6d4 Minor fixes 2021-06-04 17:41:12 +10:00
David Bomba
5bfd596ad8 Remove geoip data 2021-06-04 10:31:59 +10:00
David Bomba
e17ff7dbfd Fix for regression in Handler.php 2021-06-04 08:30:21 +10:00
David Bomba
e97b6f00ed Fix for regression in Handler.php 2021-06-04 08:23:42 +10:00
David Bomba
d1d525cef0 Fix for regression in Handler.php 2021-06-04 08:19:59 +10:00
David Bomba
c77660495c Fixes for subscriptions 2021-06-04 08:16:18 +10:00
David Bomba
97205032a2 Fixes for subscriptions 2021-06-04 07:57:24 +10:00
David Bomba
fd3993d84e Fixes for subscriptions 2021-06-04 07:43:22 +10:00
David Bomba
d6f1caef73 Fixes for passing variables to artisan commands 2021-06-04 07:30:11 +10:00
David Bomba
14994c0e5b Fixes for subscrpitions 2021-06-03 15:55:37 +10:00
David Bomba
43c52ab753 Bug fixes 2021-06-03 15:47:09 +10:00
David Bomba
520e354a93 Bux fixes 2021-06-03 11:43:14 +10:00
David Bomba
3b14074c0b Fixes for magic links 2021-06-03 09:50:31 +10:00
David Bomba
efbd33a23b
Merge pull request #5905 from turbo124/v5-develop 
Fixes for deleting and reusing design names
 2021-06-03 08:02:46 +10:00
David Bomba
214396fa43 Fixes for deleting and reusing design names 2021-06-03 08:02:30 +10:00
Benjamin Beganović
27582c02ca
Merge pull request #5840 from beganovich/v5-2705-photo-design 
(v5) Photo design
 2021-06-02 17:22:14 +02:00
David Bomba
8d2cebb6e5 Fixes for magic links 2021-06-02 21:47:28 +10:00
David Bomba
fe49cdd128 minor fixes 2021-06-02 21:04:50 +10:00
David Bomba
6e564a20db Minor fixes 2021-06-02 20:14:00 +10:00
David Bomba
fc444b7c39 Fixes for billing portal 2021-06-02 18:55:33 +10:00
David Bomba
aac53155fc Fixes for CORS 2021-06-02 13:31:53 +10:00
David Bomba
4c0c770c56 Fixes for CORS 2021-06-02 13:14:40 +10:00
David Bomba
30e0d4a6ab Fixes for CORS 2021-06-02 12:39:44 +10:00
David Bomba
82fcf55ab2 Fixes for CORS 2021-06-02 10:58:39 +10:00
David Bomba
37de17cf38 Fixes for CORS 2021-06-02 10:48:48 +10:00
David Bomba
24b7cb7509 Fixes for CORS 2021-06-02 10:18:42 +10:00
David Bomba
d9e923e978
Merge pull request #5886 from turbo124/v5-develop 
Fixes for CORS
 2021-06-02 10:02:55 +10:00
David Bomba
980a687322 Fixes for CORS 2021-06-02 10:02:05 +10:00
David Bomba
8baaaa10c7
Merge pull request #5885 from turbo124/v5-develop 
Fixes for CORS
 2021-06-02 09:08:07 +10:00
David Bomba
f2c11f8180 Fixes for CORS 2021-06-02 09:07:53 +10:00
Benjamin Beganović
c61a94f2d1
Merge pull request #5853 from beganovich/v5-2805-tracking-campaign-source 
(v5) Passing campaign data into payment flow
 2021-06-01 16:32:34 +02:00
David Bomba
5252f83ec6 Fixes for CORS 2021-06-01 23:08:32 +10:00
David Bomba
5fe49c9e30
Merge pull request #5883 from turbo124/v5-develop 
Fixes for CORS
 2021-06-01 22:12:55 +10:00
David Bomba
315dbb5503 Fixes for CORS 2021-06-01 22:12:41 +10:00
Benjamin Beganović
44d1daa749
Merge pull request #5882 from beganovich/v5-0106-add-register-button 
(v5) Show register link on the login page
 2021-06-01 14:08:59 +02:00
Benjamin Beganović
23e23918b4 Show register link on the login page 2021-06-01 14:06:47 +02:00
David Bomba
b1e882903c
Merge pull request #5881 from turbo124/v5-develop 
Fixes for CORS
 2021-06-01 21:43:55 +10:00
David Bomba
92ad3621de Fixes for CORS 2021-06-01 21:43:36 +10:00
Benjamin Beganović
bd97b916e4
Merge branch 'v5-develop' into v5-2805-tracking-campaign-source 2021-06-01 13:38:36 +02:00
Benjamin Beganović
64830df3da
Merge pull request #5863 from beganovich/v5-3105-pdf-markdown-support 
(v5) Markdown support on PDFs
 2021-06-01 13:37:47 +02:00
Benjamin Beganović
468b576ce5
Merge pull request #5864 from beganovich/v5-3105-checkout-3ds-route 
(v5) Move Checkout.com 3DS confirmation logic into separate route
 2021-06-01 13:37:34 +02:00
David Bomba
306d63ba22 Fixes for CORS 2021-06-01 21:07:11 +10:00
David Bomba
e69cd0699e Fixes for CORS 2021-06-01 20:51:38 +10:00
David Bomba
20eca600e3 Fixes for CORS 2021-06-01 20:06:46 +10:00
David Bomba
1ddf220448 Fixes for gmail oauth 2021-06-01 19:57:05 +10:00
Benjamin Beganović
9119f57a35 Return JSON response if some of required records wasn't found 2021-06-01 11:54:15 +02:00
David Bomba
0e210e6635 Minor fixes 2021-06-01 17:24:51 +10:00
David Bomba
b581a749f2 Minor fixes 2021-06-01 16:06:00 +10:00
David Bomba
1d4f982245 Gmail Oauth 2021-06-01 15:24:47 +10:00
David Bomba
ee6c0468b2 Minor fixes 2021-06-01 10:24:20 +10:00
David Bomba
cd594914b7 fixes for password reset screen 2021-06-01 09:02:30 +10:00
David Bomba
c3946f44b0 Fixes for custom payment method name 2021-06-01 08:09:38 +10:00
David Bomba
13bfd6e7fd Fixes for setup screeen 2021-06-01 07:40:15 +10:00
Benjamin Beganović
588aeefb35 Moving logic for confirming the 3ds process into own method 2021-05-31 16:37:46 +02:00
Benjamin Beganović
8ca1b904d7 Refactor the redirect to specific route 2021-05-31 16:23:18 +02:00
Benjamin Beganović
d701125bf1 Markdown parsing for line items 2021-05-31 14:08:24 +02:00
Benjamin Beganović
c9334daa3f Note for settings-controlled parsing of markdown 2021-05-31 13:47:22 +02:00
David Bomba
40b46f2b12 Fixes for hosted company export 2021-05-31 20:47:12 +10:00
David Bomba
829b069063 Fixes for custom translations 2021-05-31 20:40:34 +10:00
Benjamin Beganović
f5d218197a Markdown support for entity footer, public notes & terms 2021-05-31 12:19:56 +02:00
David Bomba
b9191bf67a Company Ledger Adjustment 2021-05-31 15:27:26 +10:00
David Bomba
0b5232162b Working on company importer 2021-05-31 10:22:30 +10:00
David Bomba
eca6446703 Working on company importer 2021-05-31 10:10:19 +10:00
David Bomba
631e7cc4a9 Working on company importer 2021-05-31 09:47:14 +10:00
David Bomba
5e820bbba7 Working on company importer 2021-05-31 08:55:27 +10:00
David Bomba
6dc3668ff6 Fixes for tests 2021-05-31 08:17:42 +10:00
David Bomba
0f63113181
Merge pull request #5859 from turbo124/v5-develop 
v5.1.66
 2021-05-30 21:46:48 +10:00
David Bomba
b72217d74c Fixes for import company tests 2021-05-30 21:26:43 +10:00
David Bomba
e86286ee9a Fixes for tests 2021-05-30 18:03:31 +10:00
David Bomba
f22745d131 Remove delivery not from try/catch block 2021-05-30 06:50:55 +10:00
Benjamin Beganović
b20b275675 Update notes about accessign campaign data in BaseDriver.php 2021-05-29 13:19:36 +02:00
Benjamin Beganović
7eb6925c8e Note about accessing the UTM data in the BaseDriver.php 2021-05-29 13:17:02 +02:00
Benjamin Beganović
f64b0b3d19 Passing data about campaign into billing components 2021-05-29 13:16:45 +02:00
Benjamin Beganović
c7739e64ec Update logic for checking if webhook configuration is present 2021-05-29 13:16:22 +02:00
Benjamin Beganović
51ae534b94
Merge pull request #5852 from beganovich/v5-2905-ach 
(v5) Fixes for accepting ACH webhooks
 2021-05-29 13:00:30 +02:00
Benjamin Beganović
ec13e6dd14 Fixes for accepting ACH webhooks 2021-05-29 12:57:39 +02:00
David Bomba
0fe357cda6 Import Company Test 2021-05-29 08:27:06 +10:00
David Bomba
77f6bc0e0b Fixes for tests 2021-05-29 08:09:47 +10:00
David Bomba
f3b52b0a22 Fixes for tests 2021-05-28 19:57:56 +10:00
David Bomba
817f7c685f Import company 2021-05-28 18:37:08 +10:00
David Bomba
eca7d37c2e Remove strict dependencies for MySQL 2021-05-28 13:29:54 +10:00
David Bomba
1f4493f191 Bug fixes 2021-05-28 11:02:43 +10:00
David Bomba
9fc5a1c947 Tests for import company 2021-05-28 08:00:30 +10:00
Benjamin Beganović
ac696d4d65 Hero image resolving 2021-05-27 15:12:52 +02:00
David Bomba
8c643edf8f Import Company Test 2021-05-27 21:02:03 +10:00
David Bomba
442e416840 Import Company Test 2021-05-27 20:03:26 +10:00
David Bomba
f8bba8b7c0 Working on importing json 2021-05-27 15:57:07 +10:00
David Bomba
d3c8060dfb Fixes for tests 2021-05-27 11:19:07 +10:00
David Bomba
caec22c884 Fixes for return types 2021-05-27 09:59:12 +10:00
David Bomba
9805474c3d Fixes for archived/deleted task reording 2021-05-27 09:25:29 +10:00
David Bomba
c125dca154 Fixes for client portal login/auth/register pages 2021-05-27 09:14:21 +10:00
David Bomba
5825f4dae6 disable ninja tokens 2021-05-26 20:16:35 +10:00
David Bomba
b3fd7f70c8 Fixes for import 2021-05-26 20:10:24 +10:00
David Bomba
95e27fd5ac Fixes for import 2021-05-26 20:01:06 +10:00
David Bomba
65ccf75375 Fixes for import 2021-05-26 19:51:04 +10:00
David Bomba
0fba73e179 Refactor for Zipping backups 2021-05-26 18:53:37 +10:00
David Bomba
8df0f6bb27 Refactor for Zipping backups 2021-05-26 18:47:10 +10:00
David Bomba
b82cdb6b77 Fixes for DB::rollBack 2021-05-26 17:04:29 +10:00
David Bomba
e76567f337 Fixes for creating an account using OAuth 2021-05-26 16:14:47 +10:00
David Bomba
fb17dd7e0b Force stripe amount to int 2021-05-26 16:04:38 +10:00
David Bomba
6cb340ddad Better error messaging 2021-05-26 13:17:22 +10:00
David Bomba
393190ec0f Fixes for import includes 2021-05-26 12:51:58 +10:00
David Bomba
7618666c4b Fixes for tests 2021-05-26 12:37:16 +10:00
David Bomba
ba672f6fdd Fixes for test 2021-05-26 11:32:01 +10:00
David Bomba
0079e52b85 Refactor for account signups 2021-05-26 10:37:59 +10:00
David Bomba
e254a9ad73 Refactor reminders 2021-05-26 10:35:39 +10:00
David Bomba
f42de7f949 Tests for reminders 2021-05-26 09:43:23 +10:00
David Bomba
de0904ba1c Fixes for request property accessor 2021-05-26 09:26:13 +10:00
David Bomba
16ad9b8d89 Fixes for mocked data 2021-05-26 09:14:41 +10:00
David Bomba
1eb0def0ca
Merge pull request #5817 from turbo124/v5-develop 
Fixes for transformers + import
 2021-05-26 07:31:32 +10:00
David Bomba
aa71bf9787 Fixes for transformers + import 2021-05-26 07:31:17 +10:00
Benjamin Beganović
a4b1816774 Drop address2 & shipping_address2 fields from required 2021-05-25 18:30:50 +02:00
David Bomba
4b729f5804 Add logging for duplicate reminder emails 2021-05-25 12:58:54 +10:00
David Bomba
ecac7291c8 Fixes for emails 2021-05-25 09:31:12 +10:00
David Bomba
5e33eb9130 Generate temp email address for direct client portal viewing. 2021-05-25 08:32:08 +10:00
David Bomba
9d20ddca2a Add outstanding to invoice totals 2021-05-24 21:54:22 +10:00
David Bomba
a525762b6e
Merge pull request #5804 from turbo124/v5-develop 
Fixes for language files
 2021-05-24 21:34:20 +10:00
David Bomba
922eaefa34 Add Reply TO support messaging 2021-05-24 21:31:52 +10:00
Benjamin Beganović
d66f9f4076 wip 2021-05-24 13:11:47 +02:00
David Bomba
4e8ed1e32d Force deletes from local storage also 2021-05-24 20:58:37 +10:00
David Bomba
e6531a68eb Fixes for language files 2021-05-24 20:45:31 +10:00
David Bomba
0e61a6f491 Fixes for random subdomain generator 2021-05-24 19:39:21 +10:00
David Bomba
c395be232d Fixes for MultiDB 2021-05-24 15:00:09 +10:00
David Bomba
954692ce6d Fixes for importing payments in CSVs, do not apply payments to Zero amount invoices 2021-05-24 14:57:30 +10:00
David Bomba
347f10caa6 Reset connection when performing simple DB checks 2021-05-24 14:52:08 +10:00
David Bomba
3c99c65033 FIxes for multidb 2021-05-24 14:24:16 +10:00
David Bomba
6b0d75a666 Fixes for multidb UserController 2021-05-24 11:30:30 +10:00
David Bomba
0b71bc03b0 Fixes for User Route 2021-05-24 10:53:04 +10:00
David Bomba
af04fb9a37 Fixes for MultiDB UserController 2021-05-24 10:41:23 +10:00
David Bomba
c62b2bec7d Constrain by company_id 2021-05-24 08:25:14 +10:00
David Bomba
a0211acc59 Fixes for Multi DB and Livewire. 2021-05-24 07:53:30 +10:00
David Bomba
10a0812ead Refactor for login flow 2021-05-24 07:23:30 +10:00
David Bomba
0bc75f5590 Minor fixes 2021-05-24 07:05:26 +10:00
David Bomba
3b7bf352a7 Fixes for trait inclusion 2021-05-23 18:59:09 +10:00
David Bomba
9d21b4fd57 Refactor LoginController 2021-05-23 18:43:50 +10:00
David Bomba
c5a24fd9d9 Fixes for OAuth using logging in over user/pass combinations 2021-05-23 07:57:53 +10:00
David Bomba
0f3495a245 Set boolean type for signup fields 2021-05-23 07:50:34 +10:00
David Bomba
4ffe1981af return first() instead of exists() 2021-05-22 16:33:31 +10:00
David Bomba
a539e68221 Fixes for import / migrations 2021-05-22 16:16:51 +10:00
David Bomba
9ddfe1ac6f Fixes for overriding ninja mailer 2021-05-22 16:03:34 +10:00
David Bomba
c458be00ae Fixes for migration mailable 2021-05-22 15:37:00 +10:00
David Bomba
1518aa1311 Fixes for migration 2021-05-22 15:34:54 +10:00
David Bomba
1762d63b6d Fixes for migration failed mailable 2021-05-22 15:10:10 +10:00
David Bomba
601d795ace Fixes for reset password 2021-05-22 14:45:09 +10:00
David Bomba
264477a2de Fixes for reset password 2021-05-22 14:31:48 +10:00
David Bomba
78e12b60ed Fixes for migration failed mailable 2021-05-22 13:32:33 +10:00
David Bomba
4b71159850 Fixes for failed migration 2021-05-22 13:20:40 +10:00
David Bomba
9652c55834 Enable previewing Recurring invoice pdfs 2021-05-22 13:09:28 +10:00
David Bomba
81b38ae894 Generate random domain name for hosted clients on migration 2021-05-22 12:36:35 +10:00
David Bomba
8970f6415b Fixes for reminder scheduling 2021-05-21 23:29:59 +10:00
David Bomba
bf812ad19e Add auto bill enabled to transformer 2021-05-21 22:08:56 +10:00
David Bomba
9193484a7d Fixes for migration 2021-05-21 20:08:48 +10:00
David Bomba
4183c1a2ae
Merge pull request #5769 from turbo124/v5-develop 
v5.1.63
 2021-05-21 18:01:14 +10:00
=
735771eef2 v5.1.63 2021-05-21 17:39:59 +10:00
=
5c26fc572c fixes for migration 2021-05-21 17:24:35 +10:00
=
cf98a03d0e Fixes for import 2021-05-21 17:20:50 +10:00
David Bomba
b58d3f390e Fixes for Stripe Connect 2021-05-21 15:47:05 +10:00
David Bomba
99dd97443a Fixes for vendor requests 2021-05-21 10:23:37 +10:00
David Bomba
ee0518d34f Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-05-21 07:58:51 +10:00
David Bomba
0b7891e24f Fixes for restore invoice numbering 2021-05-21 07:58:46 +10:00
Benjamin Beganović
9d7089b5b5 Change shared elements with delivery_note table 2021-05-20 15:04:24 +02:00
Benjamin Beganović
1e1b223d93 Update title for contact passwordless login 2021-05-20 13:37:50 +02:00
David Bomba
238143d88e Fixes for paths for email attachments 2021-05-20 19:50:11 +10:00
David Bomba
019d6eb009 Fixes for company requests 2021-05-20 17:09:29 +10:00
David Bomba
e0308bd982 Fixes for Import 2021-05-20 15:24:57 +10:00
David Bomba
553de8fea5 Fixes for types in update payment methods 2021-05-20 15:06:32 +10:00
David Bomba
accd5b122e Fixes for import 2021-05-20 15:04:23 +10:00
David Bomba
6614cc4248
Merge pull request #5757 from turbo124/v5-develop 
Fixes for importing Ninja clients/contacts
 2021-05-20 14:16:30 +10:00
David Bomba
c43d122e91 Fixes for importing Ninja clients/contacts 2021-05-20 14:13:54 +10:00
Benjamin Beganović
42f2065f8a Update mobile sidebar to white 2021-05-19 13:28:06 +02:00
David Bomba
69b496f8b4 Fixes for refresh route - firstload/mini_loader 2021-05-19 20:42:35 +10:00
David Bomba
f7a4588371 Fixes for refresh route - firstload/mini_loader 2021-05-19 18:38:51 +10:00
David Bomba
2e6896dd58 Fixes for importing customers into Stripe. 2021-05-19 14:27:47 +10:00
David Bomba
8c764a1716 Fixes for importing customers into Stripe. 2021-05-19 14:22:22 +10:00
David Bomba
4db46e2bb6 Fixes for Stripe import 2021-05-19 13:32:20 +10:00
David Bomba
a6008aff53 Fixes for importing customers into Stripe. 2021-05-19 13:24:18 +10:00
David Bomba
20dcc05559 Do no log client id when logging user event 2021-05-19 12:53:35 +10:00
David Bomba
b8299f7b8e Fixes for system logger constructor 2021-05-19 12:47:24 +10:00
David Bomba
49b3cab7d7 Refactor system logger to enable multidb 2021-05-19 11:12:55 +10:00
David Bomba
52c3d63349 Refactor system logger to enable multidb 2021-05-19 11:12:23 +10:00
David Bomba
8e9951b211 Fixes for missing include in reminders 2021-05-19 10:15:29 +10:00
David Bomba
c1c17eb2ed Change VersionCheck URL away from GitHub 2021-05-19 09:42:48 +10:00
David Bomba
a482e3c37e Fixes for Stripe Connect 2021-05-19 09:03:30 +10:00
David Bomba
1cc3eed322 Fixes for exceptions 2021-05-19 08:08:37 +10:00
David Bomba
0a5b4fe7e2 Wrap IP in json 2021-05-18 23:45:56 +10:00
David Bomba
470fb67877 Fixes for subdomain checks 2021-05-18 23:12:03 +10:00
David Bomba
a45341786d Debugging for Stripe Connect 2021-05-18 22:03:19 +10:00
David Bomba
754bed50d3
Merge pull request #5735 from turbo124/v5-develop 
Fixes for setup + new js package
 2021-05-18 20:26:22 +10:00
David Bomba
4492346e48 Fixes for setup + new js package 2021-05-18 20:26:06 +10:00
Benjamin Beganović
1eaecdd8c6
Merge pull request #5700 from beganovich/v5-1405-client-portal-settings 
(v5) Update client settings to match the one's at the admin panel
 2021-05-18 12:05:59 +02:00
Benjamin Beganović
21d12bef77
Merge pull request #5734 from beganovich/v5-1805-credits-updates 
(v5) Client portal: "Credits" updates
 2021-05-18 12:05:05 +02:00
Benjamin Beganović
cd2a104fbc Fullscreen view for credits 2021-05-18 12:03:06 +02:00
David Bomba
2291d908d0
Merge pull request #5733 from turbo124/v5-develop 
Fixes for Stripe Connect
 2021-05-18 19:55:22 +10:00
David Bomba
5c11901625 Fixes for Stripe Connect 2021-05-18 19:54:57 +10:00
Benjamin Beganović
9dc418ec5b
Merge pull request #5691 from beganovich/v5-1204-tasks 
(v5) Client portal: Tasks
 2021-05-18 11:08:46 +02:00
Benjamin Beganović
fad1743e30 Update Carbon locale before rendering the tasks page 2021-05-18 11:08:26 +02:00
Benjamin Beganović
708073a83e
Merge branch 'v5-develop' into v5-1405-client-portal-settings 2021-05-18 10:57:26 +02:00
David Bomba
d049c56573 fixes for migration 2021-05-18 17:28:13 +10:00
David Bomba
9493a43f38
Merge pull request #5731 from turbo124/v5-develop 
Refactor for Stripe Connect
 2021-05-18 17:09:44 +10:00
David Bomba
3f373d873f Fixes for Stripe Connect 2021-05-18 15:53:00 +10:00
David Bomba
d515a1ee97 Fixes for stripe connect 2021-05-18 14:02:57 +10:00
David Bomba
f39bdaef73 Fixes for Stripe Connect 2021-05-18 13:28:59 +10:00
David Bomba
9599c8de4f Refactor for Stripe Connect 2021-05-18 12:13:00 +10:00
Benjamin Beganović
23c8a0e819
Merge pull request #5729 from beganovich/v5-1705-sorting-line-items 
(v5) Drop the logic for the ordering items
 2021-05-17 16:31:03 +02:00
David Bomba
90ee9a4ca6 Fixes for mailable 2021-05-17 23:15:46 +10:00
David Bomba
87c000a3e1 Stripe import customer 2021-05-17 22:24:00 +10:00
Benjamin Beganović
b15012b984 Drop the logic for the ordering items 2021-05-17 13:28:33 +02:00
David Bomba
9773e4808d Fixes for URLs 2021-05-17 20:16:30 +10:00
David Bomba
12d8da942e Import stripe customers and update their payment methods 2021-05-17 18:56:14 +10:00
David Bomba
841ad2764f Import Stripe customers 2021-05-17 16:01:32 +10:00
David Bomba
0347ca00f5 Update payment methods for Stripe 2021-05-17 14:02:43 +10:00
David Bomba
6f06e3b268 Fixes for important company gateway tokens 2021-05-17 08:32:45 +10:00
David Bomba
0506b08ee0 Email invoice paid receipts 2021-05-17 08:09:20 +10:00
David Bomba
f9347fc652 fixes for factories 2021-05-16 19:44:44 +10:00
David Bomba
4727d0cea7 Fixes for custom payment methods - and their fees and limits object 2021-05-16 17:07:07 +10:00
David Bomba
2079b3e4ba Fixes for custom payment methods - and their fees and limits object 2021-05-16 17:06:04 +10:00
David Bomba
1183be3c5f Fixes for invitation URL for invoicing.co subdomain 2021-05-16 16:44:12 +10:00
David Bomba
b0d1b7e1a1 Fixes for delivering PDFs over the wire 2021-05-16 16:26:55 +10:00
David Bomba
7bf74e012c Fixes for PDF display latency 2021-05-16 09:41:12 +10:00
David Bomba
8f996d9a93 Fixes for gateway fees less that 2021-05-16 08:18:43 +10:00
David Bomba
ae74f5a9d8 Fixes for client portal PDF display 2021-05-15 17:14:31 +10:00
David Bomba
372471b267 Playground variables for multi-db testing 2021-05-15 17:03:12 +10:00
David Bomba
499d9f6b86 Fixes for client portal constraint 2021-05-15 17:00:17 +10:00
David Bomba
f9fae690a0 Tests for import 2021-05-15 16:54:27 +10:00
David Bomba
2fbe1698ae Minor fixes for subscription URL spec 2021-05-15 14:50:07 +10:00
David Bomba
e59f00d390 Fixes for domains 2021-05-15 14:38:32 +10:00
David Bomba
2eca9a286f Fixes for domains 2021-05-15 14:29:19 +10:00
David Bomba
364f7addb6 Fixes for subdomain resolution for MultiDB 2021-05-15 14:00:29 +10:00
David Bomba
d7d76ae6ea MultiDB domain resolution for client portals 2021-05-15 13:31:41 +10:00
David Bomba
b97e72d587 Fixes for quotes and credit paths 2021-05-15 12:31:17 +10:00
David Bomba
c7dfa8547f
Merge pull request #5706 from turbo124/v5-develop 
Don't store PDFs
 2021-05-15 12:19:59 +10:00
David Bomba
c52311bcde Fixes for PDF file paths 2021-05-15 12:19:36 +10:00
David Bomba
7756ca7436 Don't store PDFs 2021-05-14 21:15:11 +10:00
Benjamin Beganović
a48556a557 Improve CheckClientExistence.php middleware 2021-05-14 12:33:12 +02:00
David Bomba
1bfa0f709e Fixes for typo 2021-05-14 19:50:33 +10:00
David Bomba
de8fb374ab Fixes for S3 storage and delivery notes 2021-05-14 19:43:06 +10:00
Benjamin Beganović
567fcd8e30 Update client settings to match the one's at the admin panel 2021-05-14 10:18:26 +02:00
David Bomba
0dac08eaa6 Fixes for large account loading 2021-05-14 17:38:16 +10:00
David Bomba
f61ba70b14 Tests for company import 2021-05-14 16:00:25 +10:00
David Bomba
8e682f474c Import Company 2021-05-14 15:23:00 +10:00
David Bomba
97b49f8df6 Fixes for download export button 2021-05-14 13:32:37 +10:00
David Bomba
c05cb2868a Fixes for middleware priority 2021-05-14 08:29:52 +10:00
David Bomba
f5435e0f8e Fixes for middleware priority 2021-05-14 08:03:57 +10:00
David Bomba
11a150274d Fixes for resolve user / company 2021-05-13 23:37:25 +10:00
David Bomba
6e967035d8 Reorder middleware to allow route model binding to be delayed 2021-05-13 23:01:23 +10:00
David Bomba
777c2dd24a Reorder middleware to allow route model binding to be delayed 2021-05-13 22:41:32 +10:00
David Bomba
8a582f7800 Fixes for reset password 2021-05-13 20:18:30 +10:00
=
daff65de01 Working on password reset throttling 2021-05-13 19:13:51 +10:00
David Bomba
ef359501ba Export Controller 2021-05-13 16:16:39 +10:00
David Bomba
e4fabfbf2d Export data 2021-05-13 16:01:12 +10:00
David Bomba
2688f7472e fixes for sofort cancellation 2021-05-13 13:32:36 +10:00
David Bomba
203fa1d06f Company Exporter 2021-05-13 12:12:18 +10:00
David Bomba
fcfe04e18e Company Exporter 2021-05-13 11:25:26 +10:00
David Bomba
9a44561b2f Fixes for attaching documents and pdfs 2021-05-13 08:13:33 +10:00
Benjamin Beganović
5a84fb6990 Tasks module in the client portal 2021-05-12 16:39:29 +02:00
David Bomba
da6ccddaaf Exceptions for emailing when company is deactivated 2021-05-12 20:46:59 +10:00
David Bomba
6aa576a342 Add history as available include for recurring invoices 2021-05-12 18:37:03 +10:00
David Bomba
f0d2e82d0c Fail safe for the system logger 2021-05-12 17:19:52 +10:00
David Bomba
ac77100981 New login notification 2021-05-12 16:31:02 +10:00
David Bomba
f60b9c30eb Add new login notification 2021-05-12 16:18:32 +10:00
David Bomba
b780b636d6 Add flag to disable internal queue 2021-05-12 15:36:23 +10:00
David Bomba
26fb1d09a5 Attach company documents if document attachments are enabled 2021-05-12 14:21:44 +10:00
David Bomba
5f8b473c33 Fixes for Stripe Connect 2021-05-12 13:25:11 +10:00
David Bomba
42d5f03130 Fixes for Stripe Connect 2021-05-12 13:15:51 +10:00
David Bomba
e8adae6568 Fixes for Stripe Connect 2021-05-12 13:00:46 +10:00
David Bomba
619179aba0 Fixes for Stripe Connect 2021-05-12 12:03:46 +10:00
David Bomba
06a242625b Fixes for stripe authorize card 2021-05-12 10:13:42 +10:00
David Bomba
b0d66138d5 Fixes for stripe authorize card 2021-05-12 08:14:29 +10:00
David Bomba
744a4d62d8 Fixes for stripe authorize card 2021-05-12 08:04:55 +10:00
David Bomba
2b1e0b4931 Fixes for stripe authorize card 2021-05-12 07:58:18 +10:00
David Bomba
b1d250e999 Fixes for stripe authorize card 2021-05-12 07:30:22 +10:00
David Bomba
e7e8922c31
Merge pull request #5670 from turbo124/v5-develop 
Fixes for stripe authorize card
 2021-05-11 23:31:18 +10:00
Benjamin Beganović
b108dda5e0 Set 'optional' to address_line_2 in gateways 2021-05-11 15:15:51 +02:00
David Bomba
899784cf45 Do not show deleted invoices 2021-05-11 22:03:44 +10:00
David Bomba
8c4fecaa2c enforce object over array 2021-05-11 21:47:19 +10:00
David Bomba
6ab6fda3f6 Updated lock file 2021-05-11 21:26:55 +10:00
David Bomba
1b2d310780 Fixes for missing dependencies 2021-05-11 21:19:44 +10:00
David Bomba
6bfaa11f59
Merge branch 'v5-develop' into v5-2804-braintree 2021-05-11 21:14:54 +10:00
David Bomba
62dd4a0a93 Fixes for Stripe Connect 2021-05-11 21:04:32 +10:00
David Bomba
e46bf71334 Fixes for deleting users / company_users and companies 2021-05-11 17:25:34 +10:00
David Bomba
07fa50c04e Fixes for tests 2021-05-11 15:52:29 +10:00
David Bomba
f19af6290a fixes for event listeners 2021-05-11 15:17:45 +10:00
David Bomba
3b01190bc2 Return error when the user isn't attached to a company 2021-05-11 14:57:36 +10:00
David Bomba
3fca12f970
Merge pull request #5661 from turbo124/v5-develop 
Disable client portal
 2021-05-11 14:37:22 +10:00
David Bomba
ad2742a0d6 Disable client portal 2021-05-11 11:55:47 +10:00
Benjamin Beganović
f07c911f8b
Merge branch 'v5-develop' into v5-2804-braintree 2021-05-10 16:55:04 +02:00
Benjamin Beganović
3fb202be2c
Merge pull request #5656 from beganovich/v5-1005-stripe-hiding-cvv 
(v5) Prefill the postal code with Stripe Elements
 2021-05-10 14:54:21 +02:00
Benjamin Beganović
d28bc96b99 Block viewing deleted credit in the client portal 2021-05-10 14:46:22 +02:00
Benjamin Beganović
50ad75b516 Fix the wrong variable reference 2021-05-10 13:35:38 +02:00
Benjamin Beganović
580628b7f9 Show quotes 2021-05-10 13:28:31 +02:00
Benjamin Beganović
604f074dfa Show invoices full screen 2021-05-10 13:26:13 +02:00
David Bomba
4979ed94de Minor fixes 2021-05-10 21:05:44 +10:00
Benjamin Beganović
3764389e04 Pass 'client_postal_code' when emitting 'passed-required-field-check' 2021-05-10 13:01:40 +02:00
David Bomba
16c5665cc6 Recurring Invoice history / activities 2021-05-10 20:20:52 +10:00
Benjamin Beganović
85822c45ac Merge upstream/v5-develop 2021-05-10 11:50:05 +02:00
=
3b5a6d5392 Events and listeners for Recurring Invoices 2021-05-10 18:45:07 +10:00
=
9f9bcb0fce Add history and activities relations' 2021-05-10 18:27:51 +10:00
=
438cf2d3ee Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-05-10 18:17:32 +10:00
David Bomba
82d274c1f2 Recurring Invoice Activities 2021-05-10 15:59:23 +10:00
David Bomba
39f3c55e8e Stripe ConnecT 2021-05-10 12:49:16 +10:00
David Bomba
907da5f27d Fixes for Stripe Connect 2021-05-10 11:57:23 +10:00
David Bomba
685b5be11c Fixes for Stripe Connect 2021-05-10 11:37:53 +10:00
David Bomba
815878be5c Fixes for Stripe Connect 2021-05-10 10:22:07 +10:00
David Bomba
dacd31bb83 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-05-10 09:53:05 +10:00
David Bomba
7808b4c30d Fixes for created_at dates in migration 2021-05-10 09:52:58 +10:00
David Bomba
87ddad6670 Working on PDF generator flags 2021-05-09 21:30:31 +10:00
=
2510fe9df8 Allow all users to see the task statuses 2021-05-09 19:03:47 +10:00
David Bomba
a9f93a2796 update import for Stripe Connect 2021-05-09 17:33:23 +10:00
David Bomba
1740f11715 We Pay 2021-05-08 16:46:14 +10:00
David Bomba
3af1346386 BCC email list 2021-05-08 11:37:32 +10:00
David Bomba
27f29f0caf BCC email list 2021-05-08 10:57:18 +10:00
David Bomba
51effc3dfe Fixes for query logging 2021-05-08 07:43:53 +10:00
David Bomba
2e6471692a Fixes for caching 2021-05-07 23:29:02 +10:00
=
ab0de39c75 Fixes for activities 2021-05-07 21:00:55 +10:00
=
b074338947 Fixes for statics 2021-05-07 20:58:24 +10:00
=
2a90476f88 Fixes for cache 2021-05-07 20:53:59 +10:00
=
31db5b44c1 WePay 2021-05-07 18:03:37 +10:00
David Bomba
bdda63a214 We Pay 2021-05-07 17:07:49 +10:00
David Bomba
3c9b096f01 WePay 2021-05-07 15:39:45 +10:00
David Bomba
5a8644ee78 Fixes for translations 2021-05-07 14:28:34 +10:00
David Bomba
ce6cea837a Fixes for scheduler 2021-05-07 11:53:32 +10:00
David Bomba
8b8d021ad1 fixes for Artisan commands 2021-05-07 11:48:13 +10:00
David Bomba
f24e566952 Fixes for LightLogs 2021-05-07 08:44:27 +10:00
David Bomba
9bc287b9cc Fixes for lightlogs 2021-05-07 08:42:41 +10:00
David Bomba
92bcc0946b
Merge pull request #5635 from turbo124/v5-develop 
Add activities to entities
 2021-05-07 08:32:44 +10:00
David Bomba
ae1af32b59 Improve quality for url 2021-05-07 08:31:00 +10:00
David Bomba
f3a56c8174 Add activities to entities 2021-05-07 07:41:37 +10:00
David Bomba
85c05f7c30 Fixes for VarEvents 2021-05-07 07:12:07 +10:00
Benjamin Beganović
92037546da Refunds 2021-05-06 16:38:54 +02:00
Benjamin Beganović
5f14c0a541 Fixing the 500 when using negative taxes 2021-05-06 12:46:02 +02:00
David Bomba
1a947d720d we pay 2021-05-06 19:39:24 +10:00
Benjamin Beganović
0c1ed84080 Use translated country names for company on PDF 2021-05-06 10:23:12 +02:00
David Bomba
2b8d7c26da Fixes for checkout gateway 2021-05-06 15:38:39 +10:00
David Bomba
eff664a586 WePayg 2021-05-06 14:39:18 +10:00
David Bomba
24f935e277 Merge branch 'wepay' of https://github.com/turbo124/invoiceninja into wepay 2021-05-06 13:44:25 +10:00
David Bomba
e9b21af5b0
Merge pull request #5625 from turbo124/v5-develop 
Add default include for mini_load
 2021-05-06 13:34:16 +10:00
David Bomba
97afe55923 Can null value 2021-05-06 13:32:13 +10:00
David Bomba
3c670592b9 Add default include for mini_load 2021-05-06 13:29:59 +10:00
David Bomba
875bd24220
Merge pull request #5624 from turbo124/v5-develop 
email_receipt flag for payment receipt emails
 2021-05-06 13:23:25 +10:00
David Bomba
2805e1cc96 email_receipt flag 2021-05-06 13:22:55 +10:00
David Bomba
eaeb47090a Load designs for mini load 2021-05-06 08:42:18 +10:00
Benjamin Beganović
62e980ca08 Use translated country names for client on PDF 2021-05-05 17:58:59 +02:00
Benjamin Beganović
e3a6f223d0 Refunds wip 2021-05-05 17:24:31 +02:00
=
d3f14887e1 WePay 2021-05-05 20:50:36 +10:00
=
194b347c29 Fixes for migration timestamps 2021-05-05 19:46:51 +10:00
=
46d5b84fb7 Fixes for created_at and updated_at timestamps in migration 2021-05-05 19:45:31 +10:00
David Bomba
991fa7079e Fixes for password protection 2021-05-05 16:44:31 +10:00
David Bomba
a7abc2cd1b Fixes for password protection 2021-05-05 16:30:12 +10:00
David Bomba
d61e7f57a2 Fixes for wepay 2021-05-05 16:21:37 +10:00
David Bomba
23f7a74e2c Fixes for password protection 2021-05-05 16:11:40 +10:00
David Bomba
b9fece424f Minor fixes for password protection cache 2021-05-05 15:56:54 +10:00
David Bomba
ab3e635447 Fixes for user updating their own record 2021-05-05 15:33:52 +10:00
David Bomba
8c00bce71b We Pay signup 2021-05-05 14:29:58 +10:00
David Bomba
e7526cb4dc Fixes for reset of counters 2021-05-05 10:58:18 +10:00
David Bomba
2655ba679b Fixes for Task properties, drop column on company_user table 2021-05-05 09:53:35 +10:00
David Bomba
430e31c1ad Minor fixes for self updater 2021-05-05 08:28:55 +10:00
Benjamin Beganović
78f87a8da0 PayPal authorize page message 2021-05-04 17:25:30 +02:00
Benjamin Beganović
54a12235b4 PayPal integration 2021-05-04 17:02:14 +02:00
Benjamin Beganović
e0f83af653 Corret class instantiate 2021-05-04 14:56:30 +02:00
David Bomba
ff7799b0bf Fixes for eager loading 2021-05-04 22:20:55 +10:00
David Bomba
4703496c7c Fixes for PSR loading 2021-05-04 22:04:07 +10:00
David Bomba
bd22dc3314 Fixes for Historical PDF generation 2021-05-04 19:56:15 +10:00
David Bomba
349d6daa07 Fixes for company gateway contsts 2021-05-04 18:56:01 +10:00
David Bomba
148f0466ed FIxes for Entity Created messageS" 2021-05-04 18:43:16 +10:00
David Bomba
9a0d8afafc Update task statuses on migration 2021-05-04 18:33:36 +10:00
David Bomba
34ba510d80 Fixes for company gateway edge case 2021-05-04 17:00:05 +10:00
David Bomba
2f9e9dc81f Port Mobile Localization 2021-05-04 14:47:37 +10:00
David Bomba
382dd88e02 Do not update/create products from migration 2021-05-04 13:54:28 +10:00
David Bomba
b2439bced8 Email Analytics 2021-05-04 13:46:45 +10:00
David Bomba
e8d6d29f17 Track bounced and spam mail 2021-05-04 12:49:32 +10:00
David Bomba
f7257e4335 Migration emails 2021-05-04 12:40:28 +10:00
Benjamin Beganović
e6697e183c Crypress: Payment with new card 2021-05-03 15:48:53 +02:00
David Bomba
a9aeb906c3 Fixes for migration 2021-05-03 22:25:45 +10:00
Benjamin Beganović
6992216117 wip 2021-05-03 14:10:46 +02:00
David Bomba
5510993d13 Fixes for gateway fees 2021-05-03 21:51:00 +10:00
David Bomba
b0835ed361 5.1.59 2021-05-03 20:50:08 +10:00
David Bomba
bbe301a903 fixes for null email_status 2021-05-03 14:55:37 +10:00
David Bomba
778a458242 Add fallback for replyto name 2021-05-03 14:50:55 +10:00
David Bomba
cc40b52d67 Add fallback for replyto name 2021-05-03 14:49:15 +10:00
David Bomba
f9083ff490 Return string for email_status 2021-05-03 14:46:38 +10:00
David Bomba
bd88640436 Fixes for invitations in migration 2021-05-03 14:02:55 +10:00
David Bomba
d68f96fb98 Minor fixes for migrations 2021-05-03 11:46:46 +10:00
=
ef4079c3f0 Add domain queue 2021-05-02 22:07:17 +10:00
=
e53d5dcb13 fixes for logging 2021-05-02 21:40:15 +10:00
=
a76d584ae4 Clean up company request 2021-05-02 20:15:11 +10:00
=
01cb9a091e Fixes for namespaces 2021-05-02 19:14:42 +10:00
=
ff62fb54df Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-05-02 18:38:10 +10:00
=
ffea966bbc Add observer information for Hosted platform 2021-05-02 18:38:00 +10:00
David Bomba
ac046688c3 Fix for recurring design id, not translating to invoice 2021-05-02 13:14:28 +10:00
Benjamin Beganović
15beb26700 Auto billing feature for credit cards using Braintree 2021-05-01 22:03:28 +02:00
Benjamin Beganović
1d4e2bcabe Fix passing correct amount to PaymentFailureMailer 2021-05-01 22:03:07 +02:00
Benjamin Beganović
f1c4b1cdb3 wip 2021-05-01 17:53:39 +02:00
David Bomba
130f0e5749 Fixes for no account in version check 2021-05-01 10:48:36 +10:00
David Bomba
e6e8b21c5e Fixes for deleting tokens from /logout route 2021-05-01 10:13:48 +10:00
David Bomba
2eae22221f Clean up update 2021-04-30 14:29:27 +10:00
David Bomba
dab7f5afba explicitly define the unwritable file 2021-04-30 14:22:36 +10:00
David Bomba
93ace021c0 do not repeat recurring crons even on failure 2021-04-30 12:51:38 +10:00
David Bomba
aba280d9ab Fixes for recurring 2021-04-30 09:01:56 +10:00
Benjamin Beganović
2ab65b12fa Ability to pay with token 2021-04-29 16:43:59 +02:00
Benjamin Beganović
77733ffd0a Saving & tokenizing the credit card 2021-04-29 15:05:45 +02:00
=
7d01858b3a Current_company=true 2021-04-29 21:36:34 +10:00
=
bdbcacb872 Add current_company filter on refresh route 2021-04-29 21:29:10 +10:00
=
460e0afb39 Add no-cache headers to prevent aggressive browser caching of assets 2021-04-29 21:07:05 +10:00
Benjamin Beganović
6cab52fc9f Show "Save card" option for credit card 2021-04-29 11:59:18 +02:00
Benjamin Beganović
d4c51871ef - Update Braintree credit card to use amount_with_fee 
- Add amount_with_fee to payment hash
 2021-04-29 11:29:28 +02:00
David Bomba
9cb2fa4263 Add parameter to reduce query burden 2021-04-29 18:57:13 +10:00
David Bomba
d26ff60258 catch all for company_user.settings 2021-04-29 17:34:30 +10:00
David Bomba
592aba6bb0 analytics 2021-04-29 13:43:40 +10:00
David Bomba
003303a83b Output results on exec() 2021-04-29 13:15:39 +10:00
David Bomba
342b383115 Minor fixes for imports 2021-04-29 12:12:44 +10:00
David Bomba
deb55dd6c8 Add in constrained queries 2021-04-29 11:31:04 +10:00
David Bomba
7fabda0ea1 fix for typo 2021-04-29 10:39:56 +10:00
David Bomba
d35cef02c3 Fixes for analytics 2021-04-29 10:02:09 +10:00
David Bomba
f26948b76f Log query analytics 2021-04-29 09:19:00 +10:00
David Bomba
61828d412a Customize the login return request 2021-04-29 08:44:40 +10:00
Benjamin Beganović
7d8c135ba7 wip 2021-04-28 15:03:22 +02:00
Benjamin Beganović
9c97421a55 wip 2021-04-28 14:54:50 +02:00
Benjamin Beganović
e77c3492ed wip 2021-04-28 12:54:27 +02:00
=
6ccaf5dad9 Minor fixes for migration 2021-04-28 20:25:21 +10:00
David Bomba
4c2df3e1ff Fixes for company sub domain 2021-04-28 14:19:32 +10:00
David Bomba
83da701646 Fixes for company domain 2021-04-28 13:58:37 +10:00
David Bomba
8a4b1a11b3 Fixes for company domain 2021-04-28 13:40:11 +10:00
David Bomba
ee94ed6ac9 Fixes for company validation rules 2021-04-28 13:21:27 +10:00
David Bomba
207e5b4d4e Fixes for protected lists 2021-04-28 13:13:39 +10:00
David Bomba
f501a42e35 Fixes for domain validation 2021-04-28 13:12:51 +10:00
David Bomba
b3ccb0f861 v5.1.55: 2021-04-28 11:27:44 +10:00
David Bomba
73bcaae3f6 Allow invoice balances to change - but do no allow them to go negative 2021-04-28 11:18:27 +10:00
David Bomba
c90bac152d Fixes for user activities 2021-04-28 10:24:37 +10:00
David Bomba
810ed113c7 Invoice / Quote / Credit created notification 2021-04-28 10:02:31 +10:00
David Bomba
ac3c1f349e Minor fixes for self update 2021-04-27 20:39:10 +10:00
David Bomba
d2bb8d6d81 Minor fixes for impmort 2021-04-27 20:38:34 +10:00
David Bomba
b0f5ca8638 Logout Controller 2021-04-27 16:03:21 +10:00
David Bomba
48da709d6e Fixes for broken DBs 2021-04-27 09:44:20 +10:00
David Bomba
1bcfa1b19d Add ability to logout all tokens from company 2021-04-27 09:34:35 +10:00
David Bomba
7a141f2631 cleanup 2021-04-26 15:47:54 +10:00
David Bomba
3e66320d8b
Merge pull request #5536 from turbo124/v5-develop 
Delete migration directory after Import
 2021-04-26 13:31:58 +10:00
David Bomba
75e833aab3 Fixes for listeners: 2021-04-26 13:01:59 +10:00
Benjamin Beganović
52f75e5fc6 Fix Javascript loading with repeating headers & footers 2021-04-25 15:52:00 +02:00
Benjamin Beganović
f0255d4ed9 Show $entity.public_notes in the totalsTable & remove $entity_footer 2021-04-25 15:20:23 +02:00
David Bomba
1f87ca6ca2 Delete migration directory after Import 2021-04-25 21:04:48 +10:00
David Bomba
a09de38f35 Default mailer middleware 2021-04-25 20:22:24 +10:00
David Bomba
f2562dcec9 Add required include for ConnectAccountController 2021-04-25 19:00:11 +10:00
David Bomba
47ad8e1394 Set default values 2021-04-25 14:45:16 +10:00
David Bomba
28caa315a5 Fixes for Analytics 2021-04-25 14:36:22 +10:00
David Bomba
da99471e15 Fixes for Analytics 2021-04-25 13:09:44 +10:00
David Bomba
727c0abaa5 Fixes for string length in analyticS 2021-04-25 10:56:33 +10:00
David Bomba
6ad597177f Fix for typo in company object 2021-04-25 08:33:25 +10:00
David Bomba
f98c618548 Analytics 2021-04-25 08:18:35 +10:00
David Bomba
e844d4715b Fixes for post mark mailer 2021-04-25 01:09:38 +10:00
David Bomba
47050adb57 Fixes for initializaing PostMark 2021-04-25 00:37:54 +10:00
David Bomba
e7e298c917
Merge branch 'v5-develop' into db 2021-04-24 23:28:02 +10:00
David Bomba
b4945220e8 Analytics 2021-04-24 23:19:46 +10:00
David Bomba
ac3b0dfad3 Fixes for gateway fees 2021-04-23 15:26:58 +10:00
David Bomba
74631e39e4 new clear cache route 2021-04-23 00:03:21 +10:00
David Bomba
20ea334106 Landing page for existing stripe connect acccounts 2021-04-22 23:51:18 +10:00
David Bomba
90d786211c Fixes for Stripe Connect 2021-04-22 23:40:36 +10:00
David Bomba
300cc9fb9e Fixes for Checkout.com 2021-04-22 23:32:34 +10:00
David Bomba
d6bd19e6c0 Fixes for stripe connect 2021-04-22 22:56:00 +10:00
David Bomba
bbaecb3c06 Fixes for routes file" 2021-04-22 21:53:21 +10:00
David Bomba
b3f6ff10fb
Merge pull request #5506 from turbo124/v5-develop 
Fixes for Stripe Connect
 2021-04-22 21:25:27 +10:00
David Bomba
067c3cad62 Fixes for Stripe Connect 2021-04-22 21:22:55 +10:00
Benjamin Beganović
3c5a70cd21
Merge pull request #5505 from beganovich/v5-2104-emails 
(v5) Fixes for emails
 2021-04-22 13:05:37 +02:00
Benjamin Beganović
b9ee87b124 wip 2021-04-22 13:03:30 +02:00
David Bomba
5d4bba2609 Remove dead wood 2021-04-22 20:42:12 +10:00
David Bomba
f62518f63b Stripe Connect 2021-04-22 20:38:22 +10:00
Benjamin Beganović
6d0c2ec5ca wip 2021-04-22 12:29:00 +02:00
Benjamin Beganović
75da6df4fa wip 2021-04-22 11:55:19 +02:00
Lee Ween Jiann
062fe152f5 Updated SetupController.php 2021-04-22 11:12:48 +08:00
David Bomba
7cef74350d Fix for accounting error when deleting a refunded payment 2021-04-22 09:35:31 +10:00
Benjamin Beganović
ca15b03eda wip 2021-04-21 17:56:18 +02:00
Benjamin Beganović
bdc564092e wip 2021-04-21 16:36:08 +02:00
=
fc223e3432 Fixes for invoice status 2021-04-21 22:27:08 +10:00
David Bomba
af7939b002 Small fixes for one time tokens 2021-04-21 20:57:34 +10:00
David Bomba
d892e0b6ed Fixes for counter 2021-04-21 19:57:59 +10:00
David Bomba
033e221d2f Adjustments for recurring invoice cron 2021-04-21 13:54:10 +10:00
David Bomba
d879d1080b Fixes for stripe connecT 2021-04-21 08:38:50 +10:00
David Bomba
d33eb77fad
Merge pull request #5488 from turbo124/v5-develop 
v5.1.49
 2021-04-21 07:43:31 +10:00
Benjamin Beganović
e58d5291e7
Merge branch 'stripe-connect' into v5-2004-stripe-connect 2021-04-20 23:42:34 +02:00
David Bomba
9388e75f77 Fixes for purge company data 2021-04-21 07:35:54 +10:00
David Bomba
82892a6349 Fixes for stateless events 2021-04-21 07:26:04 +10:00
Benjamin Beganović
eef9065f08 wip 2021-04-20 16:08:33 +02:00
David Bomba
b33df0746e Check white label license periodically 2021-04-20 22:45:35 +10:00
Benjamin Beganović
15fa60d780 wip 2021-04-20 13:32:25 +02:00
Benjamin Beganović
cc7bdf15fe wip 2021-04-20 13:31:21 +02:00
David Bomba
e6c083cf29 Stripe Connect 2021-04-20 21:30:52 +10:00
David Bomba
68ddc6e7b1 Tests for ClientGatewayToken routes 2021-04-20 16:03:14 +10:00
David Bomba
03b19e27f7 Add client gateway tokens 2021-04-20 14:26:16 +10:00
David Bomba
81c90fb1a8 Work flow for connect 2021-04-20 08:41:14 +10:00
David Bomba
d40648ba27 Minor fixes 2021-04-20 07:47:50 +10:00
David Bomba
06f08adaf2
Merge pull request #5475 from turbo124/v5-develop 
v5.1.48
 2021-04-20 07:28:40 +10:00
Benjamin Beganović
873fe6ce07
Merge branch 'v5-develop' into v5-1304-emails 2021-04-19 16:59:23 +02:00
Benjamin Beganović
de5b6473bb wip 2021-04-19 16:57:25 +02:00
Benjamin Beganović
88acfbfecb Show public notes outside of totals table 2021-04-19 13:51:00 +02:00
David Bomba
fadfdca2af fxies for tests 2021-04-19 19:59:11 +10:00
Benjamin Beganović
417260e25d wip 2021-04-19 11:41:56 +02:00
David Bomba
060404cd6c set a default task_status for orphaned tasks 2021-04-19 15:33:49 +10:00
David Bomba
25fe52ab18 Add portal_url variable 2021-04-19 11:19:00 +10:00
David Bomba
a1494a25d0 improve self updater 2021-04-19 10:54:16 +10:00
Benjamin Beganović
875c7ba950 - Dark mode 2021-04-18 17:35:33 +02:00
Benjamin Beganović
b9528d09c0 - Add support for centering the content 
- Load styles from the master branch
 2021-04-18 17:09:44 +02:00
=
9b77789c8a v5.1.47 2021-04-18 21:16:32 +10:00
=
3cfabd88d7 Reset task statuses on delete/archive 2021-04-18 19:50:06 +10:00
=
6eaff79544 Remove taxes from demo data set 2021-04-18 09:04:40 +10:00
David Bomba
d47a0e1392 Small fixes 2021-04-18 07:06:12 +10:00
David Bomba
b4afd1419e Update API definitions 2021-04-17 16:51:24 +10:00
David Bomba
af26285577 Log Task status 2021-04-17 08:57:07 +10:00
David Bomba
bc9ff3efae Log Task status 2021-04-17 08:51:24 +10:00
David Bomba
dd87bbd0e7 Log Task status 2021-04-17 08:40:27 +10:00
David Bomba
c329d1302f Return response 2021-04-17 08:35:36 +10:00
David Bomba
797d0597aa SortRequest 2021-04-17 08:32:34 +10:00
David Bomba
5df313b9fd SortRequest 2021-04-17 08:31:24 +10:00
David Bomba
115637d4fa Sort tasks 2021-04-17 08:28:19 +10:00
David Bomba
7f1da78b92 small fixes for bulk actions for payments 2021-04-17 07:42:39 +10:00
David Bomba
4fba838ee8 Minor fixes for initializing the mail malier 2021-04-16 17:16:32 +10:00
David Bomba
c90fe87388 Adjust initialization of mail service provider 2021-04-16 16:54:07 +10:00
David Bomba
7026dbd8f2 Add custom translations to email preview and sent emails 2021-04-16 16:22:42 +10:00
David Bomba
18cf8110b5 Change from singleton to binding 2021-04-16 16:03:09 +10:00
David Bomba
cba4a361ce Integrate credit payments into Subscriptions 2021-04-16 14:47:11 +10:00
David Bomba
464d810a70 Clean up for subscriptions 2021-04-16 13:58:14 +10:00
David Bomba
c04afa5127 Code cleanup and documentation of subscriptions 2021-04-16 12:11:04 +10:00
David Bomba
a994e6f916 Clean up subscription service 2021-04-16 08:58:57 +10:00
David Bomba
84ea66493c Clean up Subscription service class 2021-04-16 08:32:38 +10:00
David Bomba
0426b6c941 Add payment notification on manual payment creation 2021-04-16 07:58:34 +10:00
Benjamin Beganović
331b49ff04 wip 2021-04-15 15:56:20 +02:00
David Bomba
cac8056832 Refund subscriptions 2021-04-15 15:46:50 +10:00
David Bomba
0b1569d6d9 refund subscriptions in cancellation window 2021-04-15 15:36:50 +10:00
David Bomba
7c8bf53951 updgrade and downgrade 2021-04-15 13:40:03 +10:00
David Bomba
bb6a1c6b27 Working on downgrading subscriptions 2021-04-15 12:28:31 +10:00
David Bomba
bc56112d10 Subscriptions upgrade and downgrade 2021-04-15 11:03:12 +10:00
David Bomba
218aa6de73 Checks for partial/deposit greater than amount/balance 2021-04-15 08:09:36 +10:00
Benjamin Beganović
df6718a31e wip 2021-04-14 16:09:37 +02:00
=
4cd83ba27a Working on subscriptions 2021-04-14 21:26:45 +10:00
=
d0cb09d094 Minor fixes for task controller 2021-04-14 19:55:43 +10:00
David Bomba
c2990a21d0 Fixes for tests 2021-04-14 16:48:32 +10:00
David Bomba
3b112952d6 Minor fixes 2021-04-14 15:28:05 +10:00
David Bomba
bb0d91a30f Fixes for HTMLEngine 2021-04-14 14:49:53 +10:00
David Bomba
aabe5683e1 Refactoring subscriptions 2021-04-14 14:41:04 +10:00
David Bomba
986e7fee86 Add validation rules for recurring productS 2021-04-14 12:51:22 +10:00
David Bomba
2237939491 Subscriptions 2021-04-14 12:40:16 +10:00
David Bomba
1e663afba4 Remove commonmark implementation 2021-04-14 07:40:58 +10:00
David Bomba
5c1eb7f7eb Update texts 2021-04-14 07:40:07 +10:00
Benjamin Beganović
325d39736f wip 2021-04-13 17:07:34 +02:00
Benjamin Beganović
dba330bcb3 wip 2021-04-13 16:43:35 +02:00
David Bomba
a386a33a7e
Merge branch 'v5-develop' into v5-develop 2021-04-13 19:35:44 +10:00
David Bomba
f2342e640a Subscriptions 2021-04-13 19:34:59 +10:00
David Bomba
803818b53c Subscriptions 2021-04-13 15:04:53 +10:00
David Bomba
527d21bdc0 Subscription events 2021-04-13 13:09:47 +10:00
David Bomba
7e3a9205b9 Add event listeners for Subscriptions + fix user actioning the event() 2021-04-13 09:52:17 +10:00
David Bomba
9222b72c7e Test for truth 2021-04-12 22:16:17 +10:00
David Bomba
9d8ee8a44e Test for truth 2021-04-12 22:15:34 +10:00
David Bomba
fa602ef0cd Fixes for setting default database 2021-04-12 22:12:50 +10:00
David Bomba
bde5166827 Subscriptions 2021-04-12 21:56:08 +10:00
Benjamin Beganović
9a0417c1ba
Merge pull request #5412 from beganovich/v5-1004-billing-portal 
(v5) Billing portal
 2021-04-12 11:53:23 +01:00
Benjamin Beganović
b860dde7c6
Merge pull request #5411 from beganovich/v5-1004-show-error-from-api-billing 
(v5) Billing: Show message from eligible service
 2021-04-12 11:53:01 +01:00
Benjamin Beganović
e2b762fa75
Merge pull request #5410 from beganovich/v5-1004-custom-fields-for-quotes 
(v5) Resolve custom fields for quotes on PDF
 2021-04-12 11:52:52 +01:00
Benjamin Beganović
94a7515244
Merge pull request #5408 from beganovich/v5-1004-desc-sort-invoices 
(v5) Client portal: Sort invoices in descending order
 2021-04-12 11:52:39 +01:00
Benjamin Beganović
24d6705b7f
Merge pull request #5406 from beganovich/v5-1004-add-with-trashed-for-invoices 
(v5) Add withTrashed() for invoices table
 2021-04-12 11:52:08 +01:00
Benjamin Beganović
84e930e971
Merge pull request #5405 from beganovich/v5-1004-ach-message 
(v5) Send ACH notification e-mail after connecting bank account
 2021-04-12 11:51:55 +01:00
Benjamin Beganović
c319dedf75
Merge pull request #5395 from beganovich/v5-0904-decode-html-on-frontend 
(v5) Switch decoding HTML from backend to Javascript
 2021-04-12 11:40:20 +01:00
David Bomba
3b7c4d64f5 Stripe Connect Stubbed 2021-04-12 20:11:08 +10:00
David Bomba
477aa691a9 Add custom exceptions 2021-04-12 14:36:51 +10:00
David Bomba
4ede6bd41e Add subscription delete routes 2021-04-11 13:52:37 +10:00
David Bomba
f5092e8cf4 Fixes for custom email templates 2021-04-11 13:46:40 +10:00
Benjamin Beganović
8a93cda5ff wip 2021-04-10 14:01:09 +02:00
Benjamin Beganović
cb9bfe02c2 Show message from eligible service 2021-04-10 13:56:29 +02:00
Benjamin Beganović
1ba9e44e2e wip 2021-04-10 13:33:56 +02:00
Benjamin Beganović
bb7f9c64d5 Sort invoices in descending order 2021-04-10 12:48:51 +02:00
Benjamin Beganović
b345e12678 Add withTrashed for invoices table 2021-04-10 10:56:48 +02:00
Benjamin Beganović
7e1cc64247 Send ACH notification e-mail after connecting bank account 2021-04-10 10:44:06 +02:00
David Bomba
d91e8c438e Working on Pro Rata Refunds 2021-04-10 14:53:16 +10:00
David Bomba
62401555cd Working on pro rata refunds 2021-04-10 14:07:08 +10:00
David Bomba
ccaa5c1d31 Improve mock data quality: 2021-04-10 12:47:47 +10:00
David Bomba
7372aecb1a Remove logging 2021-04-10 12:15:37 +10:00
David Bomba
1696c63ba4 fixes for endless recursion 2021-04-10 12:01:36 +10:00
David Bomba
5279888d6d Clean logging out 2021-04-10 10:27:04 +10:00
David Bomba
48f610d43f Fixes for surcharge tax totals 2021-04-10 09:59:19 +10:00
David Bomba
fa9815ea48 Fixes for self-updater 2021-04-10 08:41:36 +10:00
David Bomba
c16b2c193a Fixes for white label 2021-04-10 08:27:02 +10:00
Benjamin Beganović
d44691c613 wip 2021-04-09 13:11:28 +02:00
Benjamin Beganović
7799b34346 wip 2021-04-09 13:06:14 +02:00
=
e7707a919b Delete invoice when payments are applied 2021-04-09 19:51:17 +10:00
=
045fd56304 Change default pdf column properties 2021-04-09 17:44:17 +10:00
=
2ab00ed2d8 Remove redundant packages 2021-04-09 17:39:52 +10:00
David Bomba
5be620ccde Refactor self updater 2021-04-09 15:53:12 +10:00
David Bomba
b6d26fa7c9 Refactor self updater 2021-04-09 15:03:06 +10:00
David Bomba
c77faa746d refactor self updating 2021-04-09 11:22:11 +10:00
David Bomba
a6e12ee95b Working on new self updater 2021-04-09 10:33:54 +10:00
David Bomba
17a36fd14b minor fixes 2021-04-09 08:37:03 +10:00
David Bomba
5f7f18840f v5.1.42 2021-04-09 07:57:01 +10:00
Benjamin Beganović
6b8b29536a
Merge pull request #5385 from beganovich/v5-0804-page-size 
(v5) PDFs: Add $page_size & $page_layout
 2021-04-08 17:54:15 +02:00
Benjamin Beganović
c17893f9a8 Add $page_size & $page_layout 2021-04-08 17:49:28 +02:00
Benjamin Beganović
c0f5780172 wip 2021-04-08 17:11:14 +02:00
Benjamin Beganović
ec1d4e05c1 - Rename: $target_subscription to $target and all references 
- Ability to pay for the upgrade
 2021-04-08 16:53:54 +02:00
David Bomba
8e327d3a75 v5.1.41 2021-04-08 21:08:29 +10:00
David Bomba
47113da4fa Fixes for invoice properties 2021-04-08 20:50:53 +10:00
David Bomba
d9d042724e Add daily reset 2021-04-08 20:38:31 +10:00
David Bomba
084c3b78a6 Add update route 2021-04-08 20:01:00 +10:00
David Bomba
0225526756 Set password for new users 2021-04-08 14:35:02 +10:00
David Bomba
8f91969c49 bug fixes for subscriptions 2021-04-08 12:43:31 +10:00
David Bomba
fbec084e9d
Merge pull request #5374 from turbo124/v5-develop 
Suppress optimize on shared hosting
 2021-04-08 10:33:31 +10:00
David Bomba
3857b1dc3e Test for recurring updates 2021-04-08 09:21:09 +10:00
David Bomba
c2b4210241 Suppress optimize on shared hosting 2021-04-08 08:42:23 +10:00
David Bomba
4c56d7328c Add page layout option 2021-04-08 08:19:36 +10:00
Benjamin Beganović
969d9f03dc wip 2021-04-07 18:08:26 +02:00
Benjamin Beganović
71d28e691b wip 2021-04-07 14:23:14 +02:00
Benjamin Beganović
43e6ba2ec6 Check if payment is eligible to process 2021-04-07 13:26:50 +02:00
David Bomba
c1b6e2043e Fixes for subscriptions 2021-04-07 21:05:09 +10:00
David Bomba
3a3ddc031c Working on subscriptions 2021-04-07 18:06:50 +10:00
David Bomba
498d8e4efc Subscription Crons 2021-04-07 13:35:16 +10:00
David Bomba
38a648866c Account cleanup 2021-04-07 12:40:48 +10:00
David Bomba
73e7aadaad Working on pro plan; 2021-04-07 08:56:36 +10:00
David Bomba
23206d7a67 Add licenses table 2021-04-07 00:00:24 +10:00
David Bomba
048405decc check object prior to testing properties 2021-04-06 22:38:59 +10:00
David Bomba
161f20fae7 Fixes for paths to s3 type storage 2021-04-06 22:36:50 +10:00
David Bomba
69f6179e6a 5.1.36 2021-04-06 20:38:56 +10:00
David Bomba
db5e896e46 5.1.35 2021-04-06 19:07:21 +10:00
David Bomba
fcac89a92c Subscription service 2021-04-06 17:55:18 +10:00
David Bomba
06c5cf0519 add response to system logger for subscription API calls 2021-04-06 17:14:30 +10:00
David Bomba
6b9001684e Fixes for tests 2021-04-06 17:11:58 +10:00
David Bomba
fe7b3c79e7 Working on subscriptions 2021-04-06 16:07:35 +10:00
David Bomba
355d0ae7b5 Testing Permissions 2021-04-06 14:02:27 +10:00
David Bomba
6d1d950c4e Ninja Feature Tests 2021-04-06 13:05:40 +10:00
David Bomba
fac1eebd2c PHP 8.0 suppotr 2021-04-06 10:43:56 +10:00
David Bomba
378cf1c60c Fixes for localizing emails 2021-04-06 08:35:27 +10:00
David Bomba
9cb8e865fc Fixes for assigned_user_id and group_id not sticking to subscriptions 2021-04-06 08:21:55 +10:00
David Bomba
b1e6325ef8 Fixes for tests 2021-04-06 08:19:27 +10:00
David Bomba
40335c0d92 Add rest method and headers to webhooks 2021-04-06 07:41:51 +10:00
David Bomba
d9047b413a Disable product price updating if currencies do not match 2021-04-06 07:36:20 +10:00
David Bomba
d293c28a55
Merge pull request #5339 from turbo124/v5-develop 
Subscriptions
 2021-04-05 22:59:27 +10:00
David Bomba
660dca561b subscriptions 2021-04-05 22:37:25 +10:00
Benjamin Beganović
2cd3ceed2e Allow expenses to be part of products table 2021-04-05 14:21:49 +02:00
Benjamin Beganović
4738920475
Merge pull request #5333 from beganovich/v5-0504-fillables-fields-over-queries 
(v5) Billing portal: Allow prefilling the client/contact fields over query parameters
 2021-04-05 13:24:45 +02:00
Benjamin Beganović
5ac1ae16ff Fixes #5314 (https://github.com/invoiceninja/invoiceninja/issues/5314) 2021-04-05 13:22:21 +02:00
Benjamin Beganović
c1a92bfb52 Fixes #5312 (https://github.com/invoiceninja/invoiceninja/issues/5312) 2021-04-05 11:04:33 +02:00
Benjamin Beganović
b230680e8f Allow prefilling the client/contact fields over query parameters 2021-04-05 10:43:25 +02:00
David Bomba
8d4fa8cb42 Working on subs 2021-04-05 12:42:49 +10:00
David Bomba
fcaabace7f Subscriptions 2021-04-05 09:21:54 +10:00
David Bomba
51c7a16423 Subscriptions 2021-04-05 09:08:16 +10:00
David Bomba
c814a754c3 Subscriptions 2021-04-05 08:37:01 +10:00
=
bf71acfe2d Fixes for tests 2021-04-04 22:47:59 +10:00
=
858c99e09d Working on subscriptions 2021-04-04 22:14:33 +10:00
David Bomba
f1f8201683 fixes for delivery note generation 2021-04-02 22:44:44 +11:00
David Bomba
f7cf6b521f
Merge pull request #5321 from turbo124/v5-develop 
fixes for subscriptions
 2021-04-02 10:19:37 +11:00
David Bomba
c3eb46d0b7 fixes for subscriptions 2021-04-02 09:09:01 +11:00
Benjamin Beganović
9ce4a787e9
Merge pull request #5318 from beganovich/v5-0104-billing-portal 
(v5) Billing portal: Show OG price when discount is applied
 2021-04-01 17:03:43 +02:00
Benjamin Beganović
83844652e5 show og price when discount is applied 2021-04-01 17:02:11 +02:00
Benjamin Beganović
e67b5acbe9
Merge pull request #5313 from beganovich/v5-0104-tax-column-hiding-fix 
(v5) Alias the $task.rate to $task.cost for column support
 2021-04-01 16:44:05 +02:00
Benjamin Beganović
08b317f7b8 allow cancellation under specific conditions 2021-04-01 16:38:46 +02:00
Benjamin Beganović
b25f79f4e1 carry coupon over magic link 2021-04-01 16:20:31 +02:00
Benjamin Beganović
6af6668ba6 remove price() from subscriptionservice 2021-04-01 16:10:26 +02:00
Benjamin Beganović
0b2613146b Show spinner after clicking payment method 2021-04-01 16:09:30 +02:00
Benjamin Beganović
30d3c8a92e pull the initial price from the model itself 2021-04-01 16:04:22 +02:00
Benjamin Beganović
ecbe6494c6 Alias the $task.rate to $task.cost for column support 2021-04-01 15:00:09 +02:00
David Bomba
a2e0fd0849 Unique subscription nameS 2021-04-01 20:56:50 +11:00
David Bomba
1e83b729d5 Minor fixes for subscriptions 2021-04-01 20:33:50 +11:00
David Bomba
3a770361aa Set valid until when a quote is marked as sent 2021-04-01 19:07:32 +11:00
David Bomba
3b9ffb431f Fixes for tests 2021-04-01 19:02:28 +11:00
David Bomba
61489ca7d3 fixes for service methods 2021-04-01 13:24:05 +11:00
David Bomba
be648230de Working on subscriptions 2021-04-01 12:58:12 +11:00
David Bomba
9bf9bc35ad
Merge pull request #5305 from turbo124/v5-develop 
Payment mailer fixes
 2021-04-01 08:29:12 +11:00
David Bomba
c78feb80e8 Fixes for payment mailer 2021-04-01 08:28:51 +11:00
David Bomba
c279cf013e add per_seat_enabled to fillable 2021-04-01 07:04:53 +11:00
Benjamin Beganović
c300ffc4d9 passwordless login 2021-03-31 18:10:44 +02:00
David Bomba
b9e56a271d Add expense type id for invoice items 2021-03-31 21:41:17 +11:00
David Bomba
9c4a223923 Fixes for notification gates 2021-03-31 13:28:03 +11:00
David Bomba
89a271e59c Improve custom label replacements in emails 2021-03-31 12:55:33 +11:00
David Bomba
e453030b4b Fixes for subscriptions repo naming 2021-03-31 11:20:41 +11:00
David Bomba
6cbfe6b1bf rename method for subcsriptions 2021-03-31 11:14:19 +11:00
David Bomba
404ee307fd Magic link maker 2021-03-31 11:07:54 +11:00
David Bomba
ffdd81ab6b
Merge pull request #5296 from turbo124/v5-develop 
Fixes for subscriptions
 2021-03-31 10:08:29 +11:00
David Bomba
f1131c07fe Fixes 2021-03-31 10:03:18 +11:00
David Bomba
8e2c07b0df Fixes 2021-03-31 09:58:50 +11:00
David Bomba
b5e0276b1c Mark approved quotes as sent 2021-03-31 08:57:14 +11:00
Benjamin Beganović
eec902429a
Merge pull request #5286 from beganovich/v5-3003-company-user-registration 
(v5) Fix acessing client register route without company instance
 2021-03-30 16:30:16 +02:00
Benjamin Beganović
1e618dcbad
Merge pull request #5287 from beganovich/v5-3003-locale-fixes-for-literal 
(v5) Show "literal" months using locale on PDFs
 2021-03-30 16:30:07 +02:00
Benjamin Beganović
6af83a8675 wip 2021-03-30 15:50:39 +02:00
Benjamin Beganović
eb0aed513f wip 2021-03-30 14:44:33 +02:00
Benjamin Beganović
d5109af225 wip 2021-03-30 14:07:31 +02:00
David Bomba
3eb9688a83 fix subscriptions schema 2021-03-30 21:08:02 +11:00
David Bomba
f5c6847a36 Minor fixes for subscription types 2021-03-30 20:41:58 +11:00
David Bomba
32fd16dfb7
Merge pull request #5284 from turbo124/v5-develop 
Subscriptions
 2021-03-30 20:37:28 +11:00
David Bomba
caf7ad5998 Minor fixes for self updater - more verbose messaging after self update 2021-03-30 18:01:20 +11:00
David Bomba
1af565abd3 minor fixes for texts 2021-03-30 16:10:31 +11:00
David Bomba
9377b9cae4 Fixes for authorize credit cards 2021-03-30 12:28:49 +11:00
David Bomba
96c191daf0 Add system logs to first load 2021-03-30 09:32:33 +11:00
David Bomba
878f00b375 add additional query filter for recurring invoices 2021-03-30 09:30:41 +11:00
Benjamin Beganović
972c1ef56e wip 2021-03-29 15:51:03 +02:00
Benjamin Beganović
05cbd30bef wip 2021-03-29 15:50:36 +02:00
Benjamin Beganović
c4ff24132e wip 2021-03-29 14:35:27 +02:00
Benjamin Beganović
d37d727d2c - Fix typo in BaseController.php 
- Add labels on top of billing page (one-time, or/and subscription)
- Show products
- Pull the price from the service
 2021-03-29 12:58:03 +02:00
David Bomba
f1ece9ab6b Subscriptions 2021-03-29 21:43:42 +11:00
Benjamin Beganović
97d92cd127 wip 2021-03-29 12:25:29 +02:00
David Bomba
3183186d4d Working on subscriptions 2021-03-29 21:19:30 +11:00
David Bomba
de99ed2ba4 Fixes for quote numbering 2021-03-29 21:00:22 +11:00
David Bomba
db7df69db7 Recurring services - trial phase' 2021-03-29 14:49:29 +11:00
David Bomba
d7bf927549 Set exchange rates on invoices 2021-03-29 13:14:55 +11:00
=
646130a104 Fixes for tests 2021-03-28 13:26:46 +11:00
=
40dc8efd46 limit logging conditionally 2021-03-28 13:19:44 +11:00
=
6e813e233e Fix missing USE in CreditWasViewed event 2021-03-28 13:09:47 +11:00
David Bomba
6489d73ad6 Fixes for subscriptions 2021-03-28 09:15:12 +11:00
David Bomba
2e139a633b Validation rules for subscriptions 2021-03-28 08:45:46 +11:00
David Bomba
8dedfa4cb5
Merge pull request #5266 from turbo124/v5-develop 
Subscriptions
 2021-03-27 20:26:53 +11:00
=
9fd40f55c6 Exchange rates 2021-03-27 14:51:34 +11:00
=
3479c127fd Fixes for subscription refactor 2021-03-27 14:22:19 +11:00
=
83c636aa55 update todos 2021-03-27 09:05:37 +11:00
=
46a525f04d Create invoice for subscription 2021-03-27 08:55:04 +11:00
=
95749b4822 Subscriptions - invoice generation logic 2021-03-27 08:39:08 +11:00
David Bomba
2c83abe432 Subscriptions 2021-03-27 07:28:56 +11:00
David Bomba
f067290462 Update rules for updating an entity 2021-03-27 06:43:52 +11:00
David Bomba
fc3889671e Fixes for HTMLEngine 2021-03-27 06:30:46 +11:00
David Bomba
c47318df1e Fixes for company presenter 2021-03-27 06:21:47 +11:00
Benjamin Beganović
8e3508a2b1
Merge pull request #5253 from beganovich/v5-2503-billing-portal 
(v5) 25.03: Billing page
 2021-03-26 15:05:08 +01:00
David Bomba
750da31021 Transform id's correctly 2021-03-26 20:38:51 +11:00
David Bomba
b3863581ae Stubs for products / recurring products and subscription price 2021-03-26 20:20:37 +11:00
David Bomba
b40751a2b9 Auto optimize after composer install 2021-03-26 19:34:39 +11:00
David Bomba
98e314b6c0 Fixes for calculating the correct gateway fee depending on the payment method 2021-03-26 19:18:25 +11:00
David Bomba
fd24449f95 Fixes for deleting / restoring / removing users 2021-03-26 19:07:43 +11:00
David Bomba
8eb8f6e098 Fixes for tests 2021-03-26 06:42:25 +11:00
Benjamin Beganović
ed4fff2385 - Bundle qty without ability to increment/decrement value ✅ 
- One time & subs ✅
- A table with all products included in subscription (qty, price, notes) ✅
- Two tables, one for subscriptions, one for one-time purchases ✅
- If no products, no table ✅
- Remove quantity from cached data that is being sent ✅
- Remove "billing_subscription_id" from data sent ✅
 2021-03-25 16:52:03 +01:00
David Bomba
abd3a89bc9
Subscriptions (#5248) 
* Fixes for converting quote to invoice

* Fixes for naming PDFs

* Refresh entity prior to sending

* Fixes for subscriptions

* Add in required use

* Fixes for notifications

* Fixes for notifications

* Add with trasheD

* Rename BillingSubscriptions to Subscriptions

* Refactoring subscriptions
 2021-03-25 21:55:59 +11:00
David Bomba
cb7f27462b
Client subscriptions + bug fixes (#5238) 
* Fixes for converting quote to invoice

* Fixes for naming PDFs

* Refresh entity prior to sending

* Fixes for subscriptions

* Add in required use

* Fixes for notifications

* Fixes for notifications
 2021-03-24 20:14:30 +11:00
Benjamin Beganović
49c4707e38
Update BillingPortalPurchase.php 2021-03-23 16:27:30 +01:00
Benjamin Beganović
77fdb25304
Merge branch 'v5-develop' into v5-2203-billing-portal 2021-03-23 16:23:56 +01:00
=
ae9e927039 Working on client subs 2021-03-23 23:35:48 +11:00
=
3d375e4148 Workig on client subscriptions 2021-03-23 23:17:28 +11:00
=
f74368e869 Set first user to gmail after first authorization 2021-03-23 17:19:06 +11:00
David Bomba
3ed8479411 Improve user migrations 2021-03-23 14:53:10 +11:00
David Bomba
3b72fa343f complete purchase - billing subscription 2021-03-23 14:26:21 +11:00
David Bomba
417ed6c13d Fixes for recurring 2021-03-23 08:24:05 +11:00
David Bomba
3ebe533fc8 include Account clas 2021-03-23 07:09:42 +11:00
Benjamin Beganović
e78fb7e891 Update quering the language/locale using Cache instead of DB 2021-03-22 14:09:29 +01:00
Benjamin Beganović
535d9ae471 Update data passed to startTrial 2021-03-22 14:03:32 +01:00
Benjamin Beganović
d5ad6088f6 Create data mapper for cached data / billing context 2021-03-22 13:56:26 +01:00
Benjamin Beganović
6e714747bd Update price per quantity 2021-03-22 13:53:34 +01:00
Benjamin Beganović
8bc4896daa Hide/show coupon code field if promo code configured in billing tableclear 2021-03-22 13:34:59 +01:00
Benjamin Beganović
8839bfabd3 Hide quantity if max_seats_limit = 1 2021-03-22 13:32:29 +01:00
David Bomba
5700da5323 Fixes for password protection 2021-03-22 22:18:57 +11:00
David Bomba
a74e38902b
Merge pull request #5222 from turbo124/v5-develop 
Fixes for default timeouts
 2021-03-22 22:12:28 +11:00
David Bomba
5d28271df9 Fixes for default timeouts 2021-03-22 22:12:12 +11:00
Benjamin Beganović
296d3046e8 Add margins between items 2021-03-22 12:10:53 +01:00
Benjamin Beganović
500fa38a29 Remove nl2br for public notes 2021-03-22 12:08:59 +01:00
David Bomba
22f81a036f
Merge pull request #5220 from turbo124/v5-develop 
Fixes for default timeouts
 2021-03-22 21:55:25 +11:00
David Bomba
793247e0f7 Fixes for default timeouts 2021-03-22 21:55:09 +11:00
Benjamin Beganović
540f5b647a uncomment the initialization of billing service 2021-03-22 11:14:56 +01:00
Benjamin Beganović
44bf716fc9
Merge branch 'v5-develop' into v5-2003-fix-billing-subscription-integration 2021-03-22 11:12:14 +01:00
Benjamin Beganović
187be058f7
Merge branch 'v5-develop' into v5-1803-billing 2021-03-22 09:38:34 +01:00
David Bomba
cfdcf889ad Small type check fix 2021-03-22 17:46:59 +11:00
David Bomba
56b0452d2e Add oauth user token 2021-03-22 12:54:50 +11:00
David Bomba
0c5b551ce1 Connected Gmail Account 2021-03-22 10:48:00 +11:00
David Bomba
c97dea08d2 Connected Gmail Account 2021-03-22 09:52:39 +11:00
David Bomba
24c8325fb1 Connected Gmail Account 2021-03-22 09:02:22 +11:00
David Bomba
32b8575ce1 Connected Gmail Account 2021-03-22 08:06:26 +11:00
David Bomba
f80179814d fix conflicts 2021-03-22 07:22:20 +11:00
David Bomba
1b5d6d44f2 Set default time out 2021-03-22 07:21:51 +11:00
=
4285b5f6fc Minor fixes for oauth login 2021-03-21 21:38:57 +11:00
=
42ae8d53dd Working on client subscriptions 2021-03-21 20:45:30 +11:00
=
932185e6c2 Working on client subscriptions 2021-03-21 20:26:30 +11:00
David Bomba
c7d7916b04 Update defaults 2021-03-21 16:35:09 +11:00
David Bomba
8d490200b6 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-03-21 13:51:45 +11:00
David Bomba
58aee4250e Fixes for task policy 2021-03-21 13:51:28 +11:00
Benjamin Beganović
fdd1601120 wip 2021-03-20 23:15:26 +01:00
=
5b290b1770 Small fix for usernotifies 2021-03-21 08:57:11 +11:00
=
36ffeb9344 bug fixes 2021-03-21 08:53:33 +11:00
=
2eb7de95ad Add invoie_id to client subs 2021-03-20 14:39:30 +11:00
David Bomba
6be79ad022 Billing Subs 2021-03-20 13:57:03 +11:00
David Bomba
ba91c96c40 update texts 2021-03-20 13:49:45 +11:00
=
e2314359b9 Pass back the correct entity! 2021-03-20 11:54:47 +11:00
=
5288893220 Small fixes for 2FA 2021-03-20 11:46:42 +11:00
=
b158fb430f Small fixes for 2FA 2021-03-20 11:41:41 +11:00
=
7173ba2931 catch project exceptions 2021-03-20 11:16:29 +11:00
David Bomba
9e0328757a Tests for number validation across entities 2021-03-20 10:06:44 +11:00
David Bomba
451e4e1bbe Ensure better unique rules 2021-03-20 09:51:52 +11:00
David Bomba
b841fe7000 Working on unique rules for numbers 2021-03-20 09:29:20 +11:00
David Bomba
422fd4f88c
Merge pull request #5182 from turbo124/v5-develop 
Minor fixes
 2021-03-19 23:40:05 +11:00
David Bomba
34b9877868 Minor fixes 2021-03-19 23:37:57 +11:00
Benjamin Beganović
d98165a8dd Set client language_id if locale is present 2021-03-18 16:01:13 +01:00
Benjamin Beganović
3bcb65efc2 Set locale from query parameter 2021-03-18 15:41:26 +01:00
Benjamin Beganović
69eecbf281 Qty 2021-03-18 15:22:22 +01:00
Benjamin Beganović
415ea81eec Support for "Start Free Trial" 2021-03-18 14:14:10 +01:00
Benjamin Beganović
85c09ecf11 Show the message about coupon code/discount under the input field 2021-03-18 13:51:10 +01:00
David Bomba
2a89a12b69
Merge pull request #5175 from turbo124/v5-develop 
Fixes for 2fa
 2021-03-18 22:47:31 +11:00
David Bomba
10f7b1a309 Fixes for 2fa 2021-03-18 22:46:58 +11:00
Benjamin Beganović
c75e4e678f Set min-width for designs when using repeating headers/footers 2021-03-18 12:12:44 +01:00
David Bomba
ea1156cc81
Merge pull request #5172 from turbo124/v5-develop 
Small fix for new PDF generator
 2021-03-18 20:58:36 +11:00
David Bomba
ac6feb706e Small fix for new PDF generator 2021-03-18 20:57:55 +11:00
Benjamin Beganović
d706d226e8 Disable automatic custom column processing on the PDF 2021-03-18 09:32:11 +01:00
David Bomba
9ca9736de6 resolved conflicts' 2021-03-18 12:00:01 +11:00
David Bomba
ee15ea9434 v5.1.27 2021-03-18 11:58:10 +11:00
David Bomba
086189a1ea Hosted PDFs by invoice ninja 2021-03-18 11:53:08 +11:00
David Bomba
7fbe4ceb5d
Merge pull request #5162 from turbo124/v5-develop 
Remove illegal characters from pdf file names
 2021-03-18 08:19:56 +11:00
Benjamin Beganović
c320b6bfbb
Merge branch 'v5-develop' into v5-1103-billing-landing-page 2021-03-17 17:14:55 +01:00
Benjamin Beganović
127c6cb3cd wip 2021-03-17 16:12:25 +01:00
David Bomba
f52fb31ced Remove illegal characters from pdf file names 2021-03-17 22:29:20 +11:00