1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 15:13:29 +01:00
Commit Graph

3110 Commits

Author SHA1 Message Date
Benjamin Beganović
fef76271d2 beautify signature template 2020-11-17 16:56:59 +01:00
Benjamin Beganović
d9c430423a accept entities in array 2020-11-17 16:56:44 +01:00
Benjamin Beganović
0357b041e1 adapt payment & approve views for new terms component 2020-11-17 16:56:36 +01:00
Benjamin Beganović
6f4261683b
Merge pull request #4318 from beganovich/v5-fix-time-log-issue
(v5) Fix issues with rendering task.hours
2020-11-17 14:49:08 +01:00
Benjamin Beganović
1b70f24dbc Update logic for rendering task hours 2020-11-17 14:47:32 +01:00
Benjamin Beganović
3112efcded Support for .description 2020-11-17 14:46:22 +01:00
Benjamin Beganović
eb9e1c07e6
Merge pull request #4317 from beganovich/v5-pass-correct-company
(v5) Pass correct company to WebhookHandler for invoices
2020-11-17 13:29:30 +01:00
Benjamin Beganović
2144153e41 pass correct company 2020-11-17 13:28:13 +01:00
Benjamin Beganović
205bc72675
Merge pull request #4316 from beganovich/v5-fix-issue-with-webhook-handler
(v5) Fix issue with WebhookHandler company passing
2020-11-17 13:25:41 +01:00
Benjamin Beganović
42ca352409 Fix issue with webhook handler 2020-11-17 13:23:16 +01:00
David Bomba
c231dca308
Merge pull request #4314 from turbo124/v5-develop
Remove redundant entity notification
2020-11-17 20:18:09 +11:00
David Bomba
a182c5a8ca minor fixes for imports 2020-11-17 10:04:10 +11:00
David Bomba
5a6d543e34 Minor fixes for imports 2020-11-17 08:56:52 +11:00
Benjamin Beganović
52c51f34af
Merge pull request #4310 from beganovich/v5-cp-terms-and-privacy
(v5) Support for client portal terms & privacy policy
2020-11-16 22:19:54 +01:00
Benjamin Beganović
b886ceac4d
Merge pull request #4311 from beganovich/v5-stripe-failure
(v5) Fix bug with Stripe saving credit card
2020-11-16 22:19:38 +01:00
Benjamin Beganović
c984bd020c
Merge pull request #4312 from beganovich/v5-custom-unpaid-messages
(v5) Show custom messages in client portal
2020-11-16 22:19:02 +01:00
Benjamin Beganović
8080dffa85 show custom messages in cp 2020-11-16 15:37:09 +01:00
Benjamin Beganović
54014d93ee pass correct $customer->id 2020-11-16 14:10:45 +01:00
Benjamin Beganović
5457838c4d Store 'amount' in payment hash (Stripe/CC) 2020-11-16 13:37:13 +01:00
Benjamin Beganović
1ab8d1322b Logic for getting amount in internallyFailedPayments 2020-11-16 13:36:47 +01:00
Benjamin Beganović
fca1d94afe Support for SYSTEM_LOG_TYPE in:
- Authorize.net
- Stripe
- PayPal
2020-11-16 13:36:29 +01:00
Benjamin Beganović
134fe6bfee support for privacy policy & temrs in cp 2020-11-16 13:06:26 +01:00
David Bomba
3353527333 Minor fixes for migrations 2020-11-16 21:29:17 +11:00
David Bomba
77929a6bc3 Minor fixes for bulk import 2020-11-16 15:40:52 +11:00
David Bomba
a8f186c921 Remove redundant entity notification 2020-11-16 13:41:43 +11:00
David Bomba
49e4e77290
Merge pull request #4309 from turbo124/v5-develop
Ninja namespace in resources
2020-11-16 12:20:52 +11:00
David Bomba
68a6ea4d22
Merge branch 'v5-develop' into v5-develop 2020-11-16 12:20:44 +11:00
Benjamin Beganović
63e05b09d7
Merge pull request #4308 from beganovich/v5-fix-ampersand-breaking-pdfmaker
(v5) Support for special chars on invoices
2020-11-16 00:51:16 +01:00
Benjamin Beganović
f9b55dcd72 fix pdfmaker issues with special chars 2020-11-16 00:49:44 +01:00
Benjamin Beganović
7234bec7e3
Merge pull request #4307 from beganovich/v5-update-terminology
(v5) Update terminology in PDFs
2020-11-16 00:43:45 +01:00
Benjamin Beganović
956e1fe287 notes => description, cost => unit_cost 2020-11-16 00:42:21 +01:00
David Bomba
0e8bfa18a9 Use full namespace when calling from resources 2020-11-16 09:21:38 +11:00
David Bomba
87ca437d1a Fix for company logo not displaying in emails 2020-11-16 08:31:38 +11:00
David Bomba
4b240b05ca Add deleted_at column to paymentables 2020-11-16 08:23:20 +11:00
David Bomba
a1119f9bbe Fix edge cases with cloning invoice 2020-11-15 19:24:57 +11:00
hillelcoren
e84e8add71 New admin portal build 2020-11-14 19:13:06 +00:00
David Bomba
8d62b704e6
Merge pull request #4304 from turbo124/v5-develop
Refactor login route response.
2020-11-14 17:04:46 +11:00
David Bomba
861c4ef4e7
Merge pull request #4296 from beganovich/v5-migration-fixes
(v5) (wip) (no-merge) Refactor accepting new migrations
2020-11-14 17:03:26 +11:00
David Bomba
b1591632d8 Refactor defaults for invoice PDF 2020-11-13 22:52:11 +11:00
hillelcoren
19891cade1 New admin portal build 2020-11-13 11:26:03 +00:00
David Bomba
fe5218fd2c Fixes for resolving company_user from user object 2020-11-13 21:42:06 +11:00
David Bomba
3bec5a4044 Refactor login routes 2020-11-13 20:09:20 +11:00
David Bomba
58c6cb415e
Merge pull request #4302 from turbo124/v5-develop
Mail exceptions
2020-11-13 07:22:28 +11:00
David Bomba
a160efc6e5
Merge pull request #4298 from beganovich/v5-display-credit-pdfs
(v5) Show credit's PDF in the client portal
2020-11-13 07:18:39 +11:00
David Bomba
91a565a733
Merge pull request #4299 from beganovich/v5-cp-custom-includes
(v5) Custom client portal inclusions
2020-11-13 07:18:24 +11:00
David Bomba
0c1d2b00cf
Merge pull request #4297 from hmnd/fix/fee-percent-calculation
(v5) Use correct formula when adjust_fee_percent=true
2020-11-13 07:17:05 +11:00
hillelcoren
d2c656e6a4 New admin portal build 2020-11-12 18:45:11 +00:00
hillelcoren
377f0dfb2a New admin portal build 2020-11-12 18:01:20 +00:00
Benjamin Beganović
8324724df0 Client Portal Custom Inclusions 2020-11-12 12:29:16 +01:00
Benjamin Beganović
7937dd7df4 Show credit's PDF in the client portal 2020-11-12 12:17:49 +01:00