1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00
Commit Graph

909 Commits

Author SHA1 Message Date
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
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ć
3753f46f71
Merge pull request #5407 from beganovich/v5-1004-disable-signatures-if-no-feature
(v5) Control showing the signature with hasFeature
2021-04-12 11:52:30 +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
David Bomba
f5092e8cf4 Fixes for custom email templates 2021-04-11 13:46:40 +10:00
Benjamin Beganović
b7d49e352d wip 2021-04-10 14:07:00 +02:00
Benjamin Beganović
e9531d5d73 wip 2021-04-10 14:03:50 +02:00
Benjamin Beganović
7bf33e64b4 wip 2021-04-10 14:01:32 +02:00
Benjamin Beganović
18b5348815 wip 2021-04-10 14:01:25 +02: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ć
c4dac18af7 Control showing the signature with hasFeature 2021-04-10 11:05:50 +02:00
Benjamin Beganović
7e1cc64247 Send ACH notification e-mail after connecting bank account 2021-04-10 10:44:06 +02:00
David Bomba
62401555cd Working on pro rata refunds 2021-04-10 14:07:08 +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ć
41f37fc189 wip 2021-04-08 17:13:16 +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
0225526756 Set password for new users 2021-04-08 14:35:02 +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ć
6b73d78abe Show product notes only 2021-04-07 13:27:16 +02:00
Benjamin Beganović
43e6ba2ec6 Check if payment is eligible to process 2021-04-07 13:26:50 +02:00
Benjamin Beganović
d109113004
Merge pull request #5341 from beganovich/v5-0504-disable-invoice-signatures-if-feature-not-present
(v5) Client portal: Show the signature if account has feature
2021-04-05 17:13:34 +02:00
Benjamin Beganović
2ba543248a Show the signature if account has feature 2021-04-05 17:12:18 +02:00
David Bomba
d293c28a55
Merge pull request #5339 from turbo124/v5-develop
Subscriptions
2021-04-05 22:59:27 +10:00
Benjamin Beganović
43ea49c251 Show product description under product key 2021-04-05 13:57:51 +02:00
Benjamin Beganović
b230680e8f Allow prefilling the client/contact fields over query parameters 2021-04-05 10:43:25 +02:00
David Bomba
f1f8201683 fixes for delivery note generation 2021-04-02 22:44:44 +11:00
David Roizenman
5ea8d7ee5e
fix email header background color in gmail 2021-04-02 00:21:56 -07:00
Benjamin Beganović
83844652e5 show og price when discount is applied 2021-04-01 17:02:11 +02:00
Benjamin Beganović
08b317f7b8 allow cancellation under specific conditions 2021-04-01 16:38:46 +02:00
Benjamin Beganović
e69e9f7620 update text on passwordless login 2021-04-01 16:11:09 +02:00
Benjamin Beganović
45c23cbaf5 remove blue badges on the top 2021-04-01 16:09:52 +02:00
Benjamin Beganović
0b2613146b Show spinner after clicking payment method 2021-04-01 16:09:30 +02:00
David Bomba
7cb4806a65
Merge pull request #5308 from turbo124/v5-develop
if/else blocks for flutter canvas build
2021-04-01 19:40:19 +11:00
Benjamin Beganović
124490ab48 wip 2021-04-01 01:55:46 +02:00
David Bomba
97aec846ff if/else blocks for flutter canvas build 2021-04-01 10:10:31 +11:00
Benjamin Beganović
c300ffc4d9 passwordless login 2021-03-31 18:10:44 +02: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
3eb9688a83 fix subscriptions schema 2021-03-30 21:08:02 +11:00
Benjamin Beganović
9a67ff6f2c wip 2021-03-29 16:32:23 +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
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
Benjamin Beganović
e04ed7c2bf Show per year per month as recurring_invoice frequency is defined using RecurringInvoice method helper 2021-03-22 14:01:36 +01:00
Benjamin Beganović
6e714747bd Update price per quantity 2021-03-22 13:53:34 +01:00
Benjamin Beganović
edbcb0690e Remove /unit from product quantity 2021-03-22 13:38:01 +01:00
Benjamin Beganović
b2c7226057 Hide coupon if trial is enabled 2021-03-22 13:37:26 +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
Benjamin Beganović
546619a498 Wrap quantity if per_seat_enabled 2021-03-22 13:24:58 +01:00
Benjamin Beganović
5aa30ca582 Add border on stripe elements 2021-03-22 13:13:54 +01:00
Benjamin Beganović
c8666efafd wip 2021-03-22 11:06:42 +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
Benjamin Beganović
28bc608d4f Fix labels on Playful design 2021-03-18 08:45:24 +01:00
Benjamin Beganović
127c6cb3cd wip 2021-03-17 16:12:25 +01:00
Benjamin Beganović
81f5808bf6 - Use user from $billing_subscription to create client
- Disable generating the cache for temporary state
- Generate the blank invoice based on the product
2021-03-17 12:06:58 +01:00
Benjamin Beganović
eb2cfde303 Merge remote-tracking branch 'upstream/v5-develop' into v5-1103-billing-landing-page 2021-03-17 07:34:23 +01:00
David Bomba
35bca3d7b6 Fixes for signature line breaks / HTML formatting 2021-03-17 11:35:41 +11:00
Benjamin Beganović
851a31b3c0 Proof of concept for billing page 2021-03-16 14:35:57 +01:00
Benjamin Beganović
4350816804 wip 2021-03-15 17:33:27 +01:00
Benjamin Beganović
dade7bad0a Merge upstream/v5-develop 2021-03-15 13:08:43 +01:00
Benjamin Beganović
66e8aa9c13 fix query 2021-03-15 11:28:30 +01:00
Benjamin Beganović
0b9c6e782d merge upstream/v5-develop 2021-03-13 14:55:13 +01:00
=
559ff0ed40 Fixes for signature not showing 2021-03-13 23:34:53 +11:00
David Bomba
f67652cf88
Merge pull request #5100 from beganovich/v5-1003-company-custom-fields
(v5) Support for custom company fields on the PDF
2021-03-13 15:07:08 +11:00
Benjamin Beganović
908678cdc4 wip 2021-03-12 15:00:33 +01:00
Joshua Dwire
a844afd128 Support pre-configured installs where setup doesn't allow changing DB info 2021-03-11 19:48:41 -05:00
Benjamin Beganović
d546c4711c wip 2021-03-11 17:20:30 +01:00
Benjamin Beganović
9db7d2e5ca Fix "Plain" design not showing company-details section 2021-03-10 16:56:41 +01:00
Benjamin Beganović
ec5077b72d Open terms of service & privacy policy in new tab 2021-03-10 14:54:31 +01:00
Benjamin Beganović
653973c826 Align content to left by default 2021-03-10 14:32:17 +01:00
David Bomba
9000117e83 Minor fixes for company logo displaying in the client portal 2021-03-10 13:02:12 +11:00
David Bomba
59d3cd8921 Minor fixes for company logo displaying in the client portal 2021-03-10 13:00:49 +11:00
David Bomba
e7e455667d Fixes for company logo in emails 2021-03-10 12:51:08 +11:00
David Bomba
f38c069883 Translate migration email 2021-03-09 22:46:33 +11:00
Benjamin Beganović
722a416839 Layout: Add urls for PDF, SMTP & database checking 2021-03-08 09:59:45 +01:00
David Bomba
9a1a5b4796 Fixes for subdirectory installation 2021-03-05 23:59:26 +11:00
Benjamin Beganović
c69b424928
Merge pull request #5020 from beganovich/v5-0303-payment-methods-fix-blinking-modal
Payment methods improvements
2021-03-03 11:54:57 +01:00
Benjamin Beganović
c48dafa962 wip 2021-03-03 11:38:59 +01:00
David Bomba
9b3ea22c22
Merge pull request #5018 from turbo124/v5-develop
Fixes for attaching a user to different companies
2021-03-03 21:11:12 +11:00
David Bomba
bfbde2ba51 Fixes 2021-03-03 21:04:10 +11:00
Benjamin Beganović
3cf168d67d Update classes for mobile PDF viewing (proper hiding cases) 2021-03-03 08:51:32 +01:00
=
c23b9b147d Fixes for attaching a user to different companies 2021-03-03 18:22:14 +11:00
Benjamin Beganović
dd71f28f87 Invoices: Removed superfluous text under the invoice number 2021-03-02 18:30:44 +01:00
Benjamin Beganović
9b227010b2 Quotes: Remove "drafts" 2021-03-02 18:29:44 +01:00
Benjamin Beganović
51be97d981 - Quotes: Waiting for approval -> Pending Approval
- Quotes: Remove superfluous text under Waiting for approval
2021-03-02 16:29:24 +01:00
Benjamin Beganović
4f95e39c28 Credits table: Add credit number column 2021-03-02 16:27:06 +01:00
Benjamin Beganović
168f08abba Credits table: Public notes -> Notes 2021-03-02 16:24:15 +01:00
Benjamin Beganović
9278c1966a Add example URL for the Website field in the client portal settings page 2021-03-02 16:22:40 +01:00
Benjamin Beganović
05118ad880 Client profile settings page: Remove sub-instructional text 2021-03-02 16:20:27 +01:00
Benjamin Beganović
f27645062c Add "Secure 256-Bit Encryption" on the payment pages 2021-03-02 15:53:13 +01:00
Benjamin Beganović
463f16d14a Update the invoice terms label text (By clicking "Next step" you accept terms -> Click "Agree" to accept terms) 2021-03-02 15:32:20 +01:00
Benjamin Beganović
d96d2887c6 Hipster: Push the company logo to top right edge 2021-03-02 14:40:43 +01:00
Benjamin Beganović
5870d8c241 Modern: Add borders between header columns (for product, tasks & delivery notes table) 2021-03-02 14:28:33 +01:00
Benjamin Beganović
cb0231a1ec Business: Reduce padding in client & company details section 2021-03-02 14:06:42 +01:00
Benjamin Beganović
dfee4d718b Change "Overdue" to "Past due" in invoices table 2021-03-02 13:43:41 +01:00
Benjamin Beganović
4992da6270 Highlight & make links in terms pop up clickable 2021-03-02 13:42:25 +01:00
Benjamin Beganović
8254aa231b E-mails: Replace primary-color variable with real value 2021-02-22 11:32:52 +01:00
Benjamin Beganović
7990ca22ec Centralize "Pay now" button 2021-02-18 13:37:27 +01:00
Benjamin Beganović
40bf73cd9a Remove redundant views 2021-02-18 13:20:26 +01:00
Benjamin Beganović
3cb6d07c20 Change default full-screen view for invoices & quotes:
- New $url property for file_path() for invoices & quotes
- "Full screen" mode now returns raw file
- Show default browser viewer for desktop devices
2021-02-18 13:18:41 +01:00
Benjamin Beganović
b52cb6def1 Fix last_name field 2021-02-17 12:19:16 +01:00
Benjamin Beganović
82412684fa Fix padding & spacing issue for mobile devices 2021-02-17 11:49:21 +01:00
Benjamin Beganović
5ba725d5e4 approve quote with one click, instead of pushing to another page 2021-02-17 11:39:22 +01:00
Benjamin Beganović
6872057207
Merge pull request #4912 from beganovich/v5-1502-client-portal-documents
(v5) Client portal: "Documents" improvements & bug fixes
2021-02-17 11:26:08 +01:00
Benjamin Beganović
deb0cd345a
Merge pull request #4923 from beganovich/v5-1602-invoice-footer-variable-parsing
(v5) PDF: Support for dynamic variables in invoice footer, public notes & terms
2021-02-17 11:25:28 +01:00
Joshua Dwire
10462cdeb4 Merge remote-tracking branch 'origin/v5-develop' into v5-develop
# Conflicts:
#	resources/views/email/import/completed.blade.php
2021-02-16 18:20:27 -05:00
Benjamin Beganović
001b6902f2 wip 2021-02-16 14:42:35 +01:00
Benjamin Beganović
e7e65e128a wip 2021-02-16 13:24:09 +01:00
Benjamin Beganović
22bd29f8fc wip 2021-02-16 13:16:22 +01:00
Benjamin Beganović
aacc3b6602 wip 2021-02-15 15:52:13 +01:00
Benjamin Beganović
63060cd878 Stripe: Show required fields if enabled in admin panel 2021-02-15 14:58:25 +01:00
Benjamin Beganović
f8403addd6 fix endless for -1 2021-02-15 13:21:52 +01:00
David Bomba
4ff96c0f58
Merge pull request #4908 from turbo124/v5-develop
Refactoring emails
2021-02-15 22:40:12 +11:00
David Bomba
120d2c21ab Refactor password reset for admin users 2021-02-15 10:39:40 +11:00
Joshua Dwire
ac99b0039d Import functionality updates 2021-02-12 19:20:15 -05:00
Benjamin Beganović
72cdc3fc5c Hide payment methods button if not gateways 2021-02-12 12:38:31 +01:00
Benjamin Beganović
9bc03ced3b show favicon if no whitelabel 2021-02-11 14:26:37 +01:00
Benjamin Beganović
4969b32ccd Add target=_blank to social links 2021-02-11 14:21:58 +01:00
Benjamin Beganović
c4d5004df8
Merge pull request #4868 from beganovich/v5-0902-design-updates
(v5) PDF design updates
2021-02-10 13:51:24 +01:00
Benjamin Beganović
6607442740 wip 2021-02-10 12:31:14 +01:00
David Bomba
7981093d97 Working on migration email notifications 2021-02-10 17:08:16 +11:00
David Bomba
313488dc60 Working on handling check data within migrations" 2021-02-10 12:59:30 +11:00
Benjamin Beganović
d8c6d40cab wip 2021-02-09 16:47:41 +01:00
Benjamin Beganović
e13bebf5e7 Change quotes.balance to quotes.amount in quotes table & approve page 2021-02-09 11:50:26 +01:00
Benjamin Beganović
91e9321049 wip 2021-02-05 13:06:47 +01:00
Benjamin Beganović
66c81d9b51 wip 2021-02-04 17:19:28 +01:00
Benjamin Beganović
aec701040a
Merge pull request #4828 from beganovich/v5-0302-cypress-checkout
(v5) Fixes & tests for gateways
2021-02-03 17:02:09 +01:00
Benjamin Beganović
6a972ba378 wip 2021-02-03 16:49:29 +01:00
David Bomba
fc79835ed6
Merge pull request #4825 from turbo124/v5-develop
Working on migrations.
2021-02-03 23:30:31 +11:00
Benjamin Beganović
83a42cf410 wip 2021-02-03 12:36:10 +01:00
David Bomba
d26e347d6d Working on migrations 2021-02-03 10:59:58 +11:00
David Bomba
7711a21429
Merge pull request #4820 from turbo124/v5-develop
Generic payment failure notifications.
2021-02-03 09:26:16 +11:00
Benjamin Beganović
862bbec4f5 -1 to ♾ 2021-02-02 14:59:10 +01:00
=
545ebd40dd Fixes for generic blade 2021-02-02 21:45:21 +11:00
David Bomba
1797cac1a9 Refactoring email 2021-02-02 16:11:33 +11:00
David Bomba
2474507790 Working on generic payment failure notification 2021-02-02 12:04:52 +11:00
David Bomba
d48756ea79 Improvements to migration email 2021-01-31 16:07:45 +11:00