1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 17:01:33 +02:00
Commit Graph

4175 Commits

Author SHA1 Message Date
David Bomba
a274fdc353
Merge pull request #4752 from turbo124/v5-stable
5.0.53
2021-01-24 16:08:35 +11:00
David Bomba
1c1dc8fb3e 5.0.53 2021-01-24 16:06:43 +11:00
David Bomba
9abb38142f fixes
for travis
2021-01-23 19:51:29 +11:00
David Bomba
c494a1e9ad fixes for travis 2021-01-23 17:23:55 +11:00
=
e39759c35b Place additional checks in the scheduler to ensure the config is optimized appropriately 2021-01-23 16:09:58 +11:00
=
ad40434686 Additional checks that the scheduler has been configured and is working 2021-01-23 15:52:54 +11:00
=
27c7572821 Do not update or create a product if Invoice generated from a task/expense 2021-01-23 15:42:27 +11:00
Benjamin Beganović
4930b7b658 wip 2021-01-22 22:49:26 +01:00
hillelcoren
9ce00ee960 New admin portal build 2021-01-22 11:49:01 +00:00
David Bomba
1c3069d227
Merge pull request #4747 from turbo124/v5-develop
Fixes for task and task status order
2021-01-22 22:18:51 +11:00
David Bomba
272a089c38 Fixes for task and task status order 2021-01-22 21:55:03 +11:00
David Bomba
c0748caaec
Merge pull request #4742 from turbo124/v5-develop
Ensure a company gateway always has at least one fees_and_limits object
2021-01-22 17:30:30 +11:00
David Bomba
4b87df07b7 Check that a company gateway always has at least one fee and limits object 2021-01-22 08:36:25 +11:00
David Bomba
3d468e5f40 Company Gateway cleanup 2021-01-22 07:45:00 +11:00
David Bomba
ebf5767bf4
Merge pull request #4741 from turbo124/v5-develop
Add support for QR code variables
2021-01-22 07:25:36 +11:00
Benjamin Beganović
713a95d3b2 ACH (Stripe):
- Pass instance of $gateway to authorize page for fields  verification
- Support for multiple tokens
2021-01-21 15:53:37 +01:00
Benjamin Beganović
056bee1c47 Credit card (Stripe):
- Wrapped Stripe card widget into div
- Default intent option is setup_future_use now
- Support for token billing
2021-01-21 14:03:38 +01:00
David Bomba
e9e4c39f17 Add support for QR code variables 2021-01-21 23:34:21 +11:00
Benjamin Beganović
29513d5462
Merge pull request #4739 from beganovich/v5-2101-fixes-for-setup-email
(v5) Remove "settings" from passed data in support e-mails
2021-01-21 10:42:03 +01:00
Benjamin Beganović
f27f5f8e97 remove from passed data 2021-01-21 10:41:05 +01:00
hillelcoren
3bd0381bc5 New admin portal build 2021-01-21 06:50:17 +00:00
David Bomba
ce0ebaa63a
Merge pull request #4738 from turbo124/v5-develop
Fixes for ledger
2021-01-21 15:51:41 +11:00
David Bomba
c173fdcc5b Fixes for ledger 2021-01-21 15:42:30 +11:00
David Bomba
05ea7f092a Fixes for ledger adjustments 2021-01-21 15:05:05 +11:00
David Bomba
ff4f2f3953 Checks on Company Ledger sanity 2021-01-21 12:33:39 +11:00
David Bomba
f06fc9f720 Minor fix for payment validations' 2021-01-21 10:58:54 +11:00
David Bomba
db9e8ff830 Add rules preventing overpayment on invoices 2021-01-21 10:53:02 +11:00
David Bomba
79723759eb Reduce test data size for large account 2021-01-21 10:05:23 +11:00
David Bomba
7d5b679214 Fix for failed() method returning an error instead of exception 2021-01-21 10:02:39 +11:00
David Bomba
62bc55cf0b Fixes for client authentication to client portal 2021-01-21 10:01:13 +11:00
David Bomba
dadfb6d6a7
Merge pull request #4737 from turbo124/v5-develop
Fixes for dependencies.
2021-01-21 07:59:06 +11:00
David Bomba
cb959fd3a3
Merge branch 'v5-develop' into v5-develop 2021-01-21 07:58:58 +11:00
hillelcoren
80e1103734 New admin portal build 2021-01-20 19:50:58 +00:00
Benjamin Beganović
2fccfe2df1 - Rewrite of checkout-credit-card.js
- Fixed bug with detach() on driver class
- Changed the way token checking works from frontend
- Support for multiple payment methods on payment page
- Changed save card label to "Save payment method details"
- Updated relevant Javascript assets
2021-01-20 16:19:01 +01:00
Benjamin Beganović
8d9f9ccf17
Merge pull request #4734 from beganovich/v5-2001-quotes-balance-column
(v5) Client portal: Change quotes terminology
2021-01-20 13:33:35 +01:00
Benjamin Beganović
c4defd55d8 Change quotes terminology:
- Changed "balance" to "amount" in approve page & quotes-table
2021-01-20 13:32:49 +01:00
Benjamin Beganović
8391787d6e
Merge pull request #4733 from beganovich/v5-2001-email-improvements
(v5) E-mail improvements & fixes
2021-01-20 13:19:50 +01:00
Benjamin Beganović
e5c7fc4416 E-mail improvements:
- Removed injection of Tailwind CSS in the TemplateEngine.php
- Removed tailwindcss@1.4.6.css & tailwind-1.2.0.css
- Updated master template of e-mails for greeting, signature & footer sections
- Updated generic template for emails
- Updated footer (clean up)
- Fixed EntitySentObject.php class name
- Removed css-inliner.php config file
- Updated button component for e-mails
2021-01-20 13:18:17 +01:00
hillelcoren
4c74151ea5 New admin portal build 2021-01-20 12:04:51 +00:00
hillelcoren
9e8fdb562e New admin portal build 2021-01-20 12:02:37 +00:00
David Bomba
e054894ffa Working on payments 2021-01-20 21:59:24 +11:00
David Bomba
ea20c55468
Merge pull request #4726 from louis-lau/v5-fix-smtp-tls-wording
Fix mail TLS options wording
2021-01-20 20:15:36 +11:00
Benjamin Beganović
52d4911042
Merge pull request #4723 from beganovich/v5-1901-cp-messages
(v5) Client portal: Set a background & center a header message
2021-01-20 09:54:29 +01:00
David Bomba
887b2bb8c8
Merge pull request #4730 from turbo124/v5-stable
5.0.52
2021-01-20 14:54:36 +11:00
David Bomba
d63be4c852 5.0.52 2021-01-20 14:53:14 +11:00
David Bomba
a021bd83d9 Clean up emails 2021-01-20 14:49:22 +11:00
David Bomba
92e5465679 Entity mail failure email 2021-01-20 12:59:39 +11:00
David Bomba
d8c8901aa0 Update framework dependencies 2021-01-20 09:55:44 +11:00
David Bomba
039290694f
Merge pull request #4729 from turbo124/v5-develop
Update
2021-01-20 09:54:44 +11:00
David Bomba
935bde6907 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-01-20 09:53:36 +11:00