Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-23 01:41:34 +02:00
Code Issues Releases Activity
9,520 Commits 7 Branches 902 Tags 2 GiB
216a1427b4
Commit Graph

1293 Commits

Author SHA1 Message Date
Benjamin Beganović
a3099b5cde Fixes for tests 2021-05-03 17:25:03 +02:00
Benjamin Beganović
6992216117 wip 2021-05-03 14:10:46 +02:00
Benjamin Beganović
bc23de2ce2 Extract credit cards to separate Javascript 2021-04-29 16:51:28 +02:00
Benjamin Beganović
2ab65b12fa Ability to pay with token 2021-04-29 16:43:59 +02: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
aefd515b4e Fixes for stripe 2021-04-29 18:36:04 +10:00
David Bomba
2039fd0ef5 fixes for stripe 2021-04-29 18:29:03 +10:00
David Bomba
f825b72540 Fixes for stripe 2021-04-29 18:27:06 +10:00
David Bomba
d12fcf7b35 remove wasm 2021-04-29 08:07:50 +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
Benjamin Beganović
ef2f825346 Show proper translation for terms modal 2021-04-25 15:57:55 +02:00
Benjamin Beganović
0651ddaff0 Update CSS for the 2021-04-25 15:22:29 +02:00
Benjamin Beganović
540b184888 Put in the #footer of templates 2021-04-25 15:17:47 +02:00
David Bomba
20ea334106 Landing page for existing stripe connect acccounts 2021-04-22 23:51:18 +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
f62518f63b Stripe Connect 2021-04-22 20:38:22 +10:00
Benjamin Beganović
ca15b03eda wip 2021-04-21 17:56:18 +02:00
Benjamin Beganović
255d25d6a6 wip 2021-04-21 16:36:46 +02:00
Benjamin Beganović
bdc564092e wip 2021-04-21 16:36:08 +02:00
David Bomba
1bd1b2ed7c JS Fixes 2021-04-20 22:17:44 +10:00
Benjamin Beganović
873fe6ce07
Merge branch 'v5-develop' into v5-1304-emails 2021-04-19 16:59:23 +02:00
Benjamin Beganović
88acfbfecb Show public notes outside of totals table 2021-04-19 13:51:00 +02: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
David Bomba
464d810a70 Clean up for subscriptions 2021-04-16 13:58:14 +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
Benjamin Beganović
df6718a31e wip 2021-04-14 16:09:37 +02:00
David Bomba
aabe5683e1 Refactoring subscriptions 2021-04-14 14:41:04 +10:00
David Bomba
2237939491 Subscriptions 2021-04-14 12:40:16 +10: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
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
Benjamin Beganović
e2d1c7ac43
Merge pull request #4778 from beganovich/v5-2701-ach-blank-screen 
(v5) ACH: Fix blank screen after payment
 2021-01-28 15:45:14 +01:00
Benjamin Beganović
3b31953d14
Merge branch 'v5-develop' into v5-2701-payable-draft-invoices 2021-01-28 15:44:22 +01:00
Benjamin Beganović
615ef1e780 Allow payments of draft invoices: 
- Remove processing overlay scripts
- Add flash message to clean layout
- Remove $balance > 0 check from filtered invoices
- Only show the payment methods if total is bigger than 0
- Change flash message from "warning" to "message"
- Show message for $1 payments
 2021-01-27 14:10:24 +01:00
Benjamin Beganović
0ff531fafa ACH: Fix white screen 
- Pass token hashed_id instead of token value
 2021-01-27 13:07:01 +01:00
Benjamin Beganović
84e888863f Authorize.net: Throw a PaymentFailed exception if token not found 
Checkout.com: Throw a PaymentFailed exception if token not found
- Show "Client portal" button even when invoice is paid
- Authorize.net: Pass token hashed_id instead of token to frontend
- Checkout.com: Pass token hashed_id instead of token to frontend
- Show "Paid" label for paid invoices
- Translation for not found token
 2021-01-27 12:45:38 +01:00
Benjamin Beganović
e6b6175ee5
Merge pull request #4770 from beganovich/v5-2601-show-save-card-programatically 
(v5) Show save card if token billing isn't always
 2021-01-27 11:55:18 +01:00
David Bomba
af47c504e4 Working on payment failed emails 2021-01-27 19:45:55 +11:00
Benjamin Beganović
9f8df64289 - Only show save card component if token billing isn't always 
- Only show "Refunded" if amount is > 0
- Stripe: Grab only :checked checkbox
 2021-01-26 17:21:12 +01:00
Benjamin Beganović
d537d012a1 fix instance 2021-01-26 13:29:27 +01:00
Benjamin Beganović
64e6dad248
Merge branch 'v5-develop' into v5-2001-gateways-and-new-tokens 2021-01-25 16:47:58 +01:00
Benjamin Beganović
fb66bfbe71 wip 2021-01-25 16:46:40 +01:00
Benjamin Beganović
f5f257292c wip 2021-01-25 16:12:21 +01:00
David Bomba
c4db674fae Translate migration email 2021-01-25 08:08:29 +11:00
Benjamin Beganović
4930b7b658 wip 2021-01-22 22:49:26 +01: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
Benjamin Beganović
f27f5f8e97 remove from passed data 2021-01-21 10:41:05 +01:00
David Bomba
62bc55cf0b Fixes for client authentication to client portal 2021-01-21 10:01:13 +11:00
David Bomba
cb959fd3a3
Merge branch 'v5-develop' into v5-develop 2021-01-21 07:58:58 +11: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ć
c4defd55d8 Change quotes terminology: 
- Changed "balance" to "amount" in approve page & quotes-table
 2021-01-20 13:32:49 +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
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
a021bd83d9 Clean up emails 2021-01-20 14:49:22 +11:00
Louis Laureys
50ec039f3e Fix mail TLS options wording 2021-01-19 21:31:39 +01:00
Benjamin Beganović
4413580b39 Add authorize view for SOFORT 2021-01-19 16:07:58 +01:00
Benjamin Beganović
c1bf3e5044 double-check 2021-01-19 15:27:35 +01:00
Benjamin Beganović
ee8e75e8f7 Set a background & center a header message 2021-01-19 15:23:10 +01:00
Benjamin Beganović
617cc54de9 - Pass instance of AuthorizePaymentDriver.php as $gateway instead of CompanyGateway record 
- Define required fields for AuthorizePaymentDriver.php
- Update references to $gateway (CompanyGateway)
- Pass $countries to required-client-info.blade.php
- Handle country submission for required-client-info.blade.php
- Only show non-filled fields in RequiredClientInfo.php
 2021-01-19 14:36:07 +01:00
Benjamin Beganović
8ed701519b Change views to authorize.blade & pay.blade 
Change structure to use the new one
Add $data to pay now button
 2021-01-19 14:03:18 +01:00
Benjamin Beganović
6295a2647d refactor authorize.blade.php 2021-01-19 13:43:03 +01:00
Benjamin Beganović
bc8d77fec2 design fixes 2021-01-19 12:37:27 +01:00
Benjamin Beganović
b8d8f977cc Update e-mail templates 
Removed fedeisas/laravel-mail-css-inliner
 2021-01-19 11:05:47 +01:00
Benjamin Beganović
ad76bb561e master 2021-01-18 15:27:32 +01:00
Benjamin Beganović
4c34bc2177 Refactor emails to plain CSS + table structure 2021-01-18 15:25:51 +01:00
Benjamin Beganović
4cfc2384c2 Only show the verification screen if method exists 2021-01-17 23:54:56 +01:00
Benjamin Beganović
bc584c387c merge upstream/v5-develop 2021-01-15 11:03:40 +01:00
David Bomba
fc6384f051
Merge pull request #4690 from beganovich/v5-0114-design-improvements 
(v5) Invoices/quotes design improvements
 2021-01-15 08:34:03 +11:00
David Bomba
e9b9ea642c
Merge pull request #4686 from beganovich/v5-0114-show-required-gateway 
(v5) Change the way required fields are displayed
 2021-01-15 08:33:20 +11:00
Benjamin Beganović
ec80d925a4 change task-duration to task-time-details 2021-01-14 15:58:29 +01:00
Benjamin Beganović
1c5c7250ee Unified margin across designs 2021-01-14 15:57:14 +01:00
Benjamin Beganović
2a193c97ea Show quotes/invoices in full-screen by default 2021-01-14 13:29:46 +01:00
Benjamin Beganović
59fd38fc3d change the way required fields are displayed 2021-01-14 12:24:45 +01:00
Benjamin Beganović
d0000de269 add todo 2021-01-14 11:08:15 +01:00
Benjamin Beganović
a5995546bc increase upload space 2021-01-14 10:37:45 +01:00
David Bomba
c49fbedcde Add entity number to header on client portal 2021-01-14 13:57:05 +11:00
David Bomba
435365b32b Add youtube channel to client portal 2021-01-14 13:43:08 +11:00
David Bomba
a140870473 Clean up dashboard message 2021-01-14 08:17:47 +11:00
David Bomba
ee85a6487c
Merge pull request #4670 from beganovich/v5-jan12-required-fields 
(v5) Required fields for gateways
 2021-01-14 07:55:27 +11:00
David Bomba
c7375decf3
Merge pull request #4679 from beganovich/v5-0113-show-refunded-amount 
(v5) Client portal: Show refunded amount
 2021-01-14 07:54:33 +11:00
David Bomba
eebfa3e949
Merge pull request #4677 from beganovich/v5-0113-fullscreen-invoices 
(v5) Change default view for invoices as full-screen
 2021-01-14 07:54:12 +11:00
Benjamin Beganović
d1e3f8f274 show refunded amount 2021-01-13 16:20:19 +01:00
Benjamin Beganović
6526e5e378 Show default view as full-screen for invoices 2021-01-13 14:46:41 +01:00
Benjamin Beganović
0d0e3510db fix issue with button 2021-01-13 14:31:28 +01:00
Benjamin Beganović
b014aecc7d - Add getClientRequiredFields in BaseDriver.php 
- Pass $fields in @required-client-info
- Don't show form if fields are satisfied
- Remove $gateway reference in RequiredClientInfo.php
- StripePaymentDriver.php required fields
- Removed old-redirect logic for required fields
 2021-01-13 13:31:00 +01:00
David Bomba
c18c9e5a66 Update copyright + remove minor text from footer 2021-01-13 19:22:36 +11:00
David Bomba
75081cf95a Fix for displaying company logo in portal 2021-01-13 18:32:35 +11:00
David Bomba
eb7cee706d Fixes for displaying company logo in email templates 2021-01-13 12:22:23 +11:00
David Bomba
249c0e8b2b fix for presenting company logo in portal 2021-01-13 12:15:04 +11:00
Benjamin Beganović
cdd62f7e2a wip 2021-01-12 16:23:39 +01:00
Benjamin Beganović
ff3ee60cf9 wip 2021-01-12 15:43:07 +01:00
Benjamin Beganović
9b9c9434db - Show currency on the invoices/payment page 
- Disable form submitting with enter
 2021-01-11 15:34:46 +01:00
David Bomba
13420a93b9 Fixes for validation 2021-01-08 21:19:26 +11:00
David Bomba
5fc9a89009
Merge pull request #4625 from beganovich/v5-fix-issue-with-remaining-cylces 
(v5) Show endless for recurring invoices with -1 cycles
 2021-01-05 09:16:06 +11:00
Benjamin Beganović
cb928833c5 Show endless for recurring invoices with -1 cycles 2021-01-04 14:24:30 +01:00
Benjamin Beganović
b266def75b Remove debug from the setup page 2021-01-04 13:42:31 +01:00
Benjamin Beganović
14efcc77e6 Support for database port on the setup 2021-01-04 13:36:47 +01:00
David Bomba
15b2ee6642 Add additional mimes 2021-01-04 21:49:28 +11:00
David Bomba
ad57469ee4 Flutter Service Worker 2021-01-04 20:53:58 +11:00
Benjamin Beganović
0e57869a15
Merge pull request #4588 from beganovich/v5-app-url-prefix-on-setup 
(v5) Require https?://  format for the APP_URL value
 2020-12-30 11:05:56 +01:00
Benjamin Beganović
06dbb1dcf2 Break words on e-mail 2020-12-29 15:14:42 +01:00
Benjamin Beganović
6b34bb551f Require https?:// format for the APP_URL value 2020-12-29 11:35:22 +01:00
David Bomba
309bead374 completed email for import 2020-12-21 13:24:09 +11:00
David Bomba
ea360cead4 Import notifications 2020-12-21 12:52:33 +11:00
David Bomba
2347b9db7a Import notification 2020-12-21 12:16:26 +11:00
Benjamin Beganović
e51b220295 Add a note about PhantomJSCloud 2020-12-16 16:55:33 +01:00
Benjamin Beganović
75b28e8799 Update setup to show step by step before letting user submit everything 2020-12-15 16:10:50 +01:00
Benjamin Beganović
7ccd10adf9 - Change $global-margin to $global_margin to keep consistency 
- Update designs accordingly
- Update ChromiumPdf version
- Apply php-cs-fixer
 2020-12-15 11:45:04 +01:00
Benjamin Beganović
dcd6574b2d Experimental PDF rendering: 
- Added experimental flag in ninja.php
- Added experimental rendering in PdfMaker.php
- Added dynamic $global-margin for 1cm/0cm based on PDF method
 2020-12-14 17:23:04 +01:00
Benjamin Beganović
5c776d4911 show custom driver with its label 2020-12-10 12:38:07 +01:00
Benjamin Beganović
37f79247ac remove payment options from custom driver 2020-12-10 12:19:13 +01:00
Benjamin Beganović
d45571d7f9 wip 2020-12-09 15:17:48 +01:00
David Bomba
6a03bcc546
Merge branch 'v5-develop' into v5-develop 2020-12-09 07:25:16 +11:00
Benjamin Beganović
5d1349393a update designs to suppport entity string 2020-12-08 16:45:24 +01:00
Benjamin Beganović
3ffb600117 prefix all db field with db_ 2020-12-08 14:21:00 +01:00
David Bomba
8107a49677 remove trailing slash from app url 2020-12-08 07:21:08 +11:00
Benjamin Beganović
1f2c3f2823 update pagination links & apply php-cs-fixer 2020-12-05 14:24:21 +01:00
Benjamin Beganović
3b9e813751 bump alpinejs version 2020-12-05 13:55:29 +01:00
Benjamin Beganović
d84f5bc5bb Fixes for Checkout.com refunding 2020-12-03 13:38:57 +01:00
Benjamin Beganović
00ab670d71 Checkout.com migration to Frames: 
- Changed cardToken to token in CreditCard reference
- Updated checkout.com.js
- Added "Pay" translation
- Fix issue with switching between token & credt card
 2020-12-02 15:33:43 +01:00
David Bomba
66fc75bb83
Merge pull request #4410 from turbo124/v5-develop 
V5 develop
 2020-12-02 08:32:45 +11:00
Benjamin Beganović
35fe90fc9f update whitelabeling partials 2020-12-01 14:44:35 +01:00
David Bomba
704ed8349e Fix for flutter path 2020-11-30 21:04:41 +11:00
Benjamin Beganović
2618a1d3b8 add ability to edit client's phone 2020-11-27 12:08:39 +01:00
Benjamin Beganović
372ab5cdd9 fix word-brekaing 2020-11-27 11:38:22 +01:00
Benjamin Beganović
6420abd429
Merge pull request #4366 from beganovich/v5-fix-confirmation-page 
(v5) Fix buttons on user pages
 2020-11-26 12:43:48 +01:00
David Bomba
1181f9de62
Merge branch 'v5-develop' into authorize_refactor 2020-11-26 22:43:25 +11:00
Benjamin Beganović
1aeae756fa blue background for buttons 2020-11-26 12:42:20 +01:00
David Bomba
a8daa31167 Fixes for authorize 2020-11-26 21:12:36 +11:00
Benjamin Beganović
169e5ba93e support for checking requirements based on gateway 2020-11-25 14:38:49 +01:00
David Bomba
efbf8069b5
Merge pull request #4360 from turbo124/v5-develop 
Fixes for migrations
 2020-11-25 20:24:06 +11:00
Benjamin Beganović
3b765d32c1 log as an option for mail driver 2020-11-24 11:12:44 +01:00
David Bomba
b5fe5070b5 Working on migrations 2020-11-23 23:55:04 +11:00
Benjamin Beganović
7e750cd510 set dynamic margin 2020-11-19 15:03:18 +01:00
Benjamin Beganović
458535a46d fix designs border 2020-11-19 15:02:29 +01:00
Benjamin Beganović
014652cf1c cookies 👨‍🍳🍪 2020-11-19 13:41:19 +01:00
Benjamin Beganović
b9598d6321 short 2020-11-18 15:14:59 +01:00
Benjamin Beganović
748a083dda invert image to white for dark templates 2020-11-18 15:12:52 +01:00
Benjamin Beganović
de15e9d1ce render terms & policy under conidition 2020-11-18 14:55:46 +01:00
David Bomba
6376d5fa98
Merge pull request #4325 from turbo124/v5-develop 
Minor fixes for client portal
 2020-11-18 08:00:02 +11:00
Benjamin Beganović
e4eb70ab1a remove referneces to gateway in cp 2020-11-17 17:23:58 +01:00
Benjamin Beganović
a4de32482c fix translation for authroize buttons 2020-11-17 17:17:28 +01:00
Benjamin Beganović
f81526af2d
Merge pull request #4322 from beganovich/v5-display-signature-and-terms-on-quotes 
(v5) Display signatures & accepting terms for invoices & quotes
 2020-11-17 17:00:59 +01:00
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ć
8a6873354f fix flashing cancellation modal & user dropdwon 2020-11-17 15:52:40 +01:00
David Bomba
8255ffc0cf Minor tests for client portal 2020-11-17 21:26:45 +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ć
8080dffa85 show custom messages in cp 2020-11-16 15:37:09 +01:00
Benjamin Beganović
134fe6bfee support for privacy policy & temrs in cp 2020-11-16 13:06:26 +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
b1591632d8 Refactor defaults for invoice PDF 2020-11-13 22:52:11 +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
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
Benjamin Beganović
1be0d2435b Fix designs' tag 2020-11-09 16:23:27 +01:00
Benjamin Beganović
0751a44d21 Update designs to support delivery-notes 2020-11-09 15:44:21 +01:00
Benjamin Beganović
40b3a45642 update the designs & fix huge gap between tables 2020-11-06 13:12:28 +01:00
Benjamin Beganović
fd8ea38580 plain 2020-11-05 14:47:28 +01:00
Benjamin Beganović
d9f915bb37 modern 2020-11-05 14:47:24 +01:00
Benjamin Beganović
bb76cec267 hipster 2020-11-05 14:47:20 +01:00
Benjamin Beganović
054998ff06 elegant 2020-11-05 14:47:17 +01:00
Benjamin Beganović
64ec10279c creative 2020-11-05 14:47:14 +01:00
Benjamin Beganović
4ee36307f9 playful 2020-11-05 14:47:09 +01:00
Benjamin Beganović
100898e530 clean 2020-11-05 14:25:48 +01:00
Benjamin Beganović
88f881faf7 business 2020-11-05 14:13:28 +01:00
Benjamin Beganović
6bd28ebbfb bold 2020-11-05 13:33:43 +01:00
David Bomba
100207f4cb
Merge pull request #4267 from turbo124/v5-develop 
Company Settings Implmentation
 2020-11-05 07:49:10 +11:00
Benjamin Beganović
a01c57bd61 Plain: Update references to #task-table 2020-11-04 14:42:29 +01:00
Benjamin Beganović
e222aa8620 Refactor 'product-table-footer' to 'table-totals' 2020-11-04 11:23:06 +01:00
David Bomba
c995ac5f44 Add API Documentation to repo 2020-11-04 12:27:07 +11:00
Benjamin Beganović
f50bbd1900 Fix issue with the form 2020-11-02 16:29:02 +01:00
Benjamin Beganović
7f3c4ada5a Merge remote-tracking branch 'upstream/v5-develop' into v2-frontend-refactor 2020-11-01 19:26:43 +01:00
Benjamin Beganović
4c27652545 ACH payments 2020-11-01 19:21:31 +01:00
Benjamin Beganović
1ae2649be6 Stripe ACH authorization & verification 2020-11-01 18:47:48 +01:00
Benjamin Beganović
99c30846ad Stripe: Payments with tokens & error handling 2020-11-01 16:52:37 +01:00
Benjamin Beganović
7e30093429 Checkout.com payments with token: 
- Convert "true" from frontend to boolean in PaymentResponseRequest
- Reference correct 'transaction_reference' in BaseDriver & Checkout\Utilities
- Frontend switching between token & credit card when making payments with Checkout.com
- New 'pay_with' translation string
- Added 'save-card--container' to save card partial
- Ensure we show whole transaction reference string in payments/show.blade
 2020-11-01 15:56:17 +01:00
Benjamin Beganović
d2e677cb9d Merge remote-tracking branch 'origin/v5-stripe-backend-refactor' into v2-frontend-refactor 2020-11-01 14:49:11 +01:00
David Bomba
b267353ced Fixes for credits view in portal 2020-10-29 21:19:10 +11:00
David Bomba
d555796418
Merge pull request #4213 from beganovich/v5-checkout-token-billing 
(v5) Checkout.com payments using token
 2020-10-28 09:37:00 +11:00
David Bomba
f855ba7231
Merge pull request #4215 from beganovich/v5-remove-deprecated-design-classes 
(v5) Remove old invoice/quotes/tasks design classes & client portal theme
 2020-10-28 09:36:16 +11:00
Benjamin Beganović
e78aacdcfc Password reset e-mai l& fix for button 2020-10-27 16:04:28 +01:00
Benjamin Beganović
99bfadc0dc Remove old designs & old bootstrap theme 2020-10-27 14:44:12 +01:00
Benjamin Beganović
88b428aae0 checkout.com payments using token 2020-10-27 13:44:16 +01:00
Benjamin Beganović
dcb48297fb wip refactor 2020-10-22 15:24:18 +02:00
David Bomba
6f84e07c10 Fixes for schema, fixes for recurring invoice markViewed() 2020-10-21 08:15:11 +11:00
Benjamin Beganović
b4b6bd3ae0 ach adding & verify, todo: payment 2020-10-20 17:54:08 +02:00
Benjamin Beganović
d26565b5ad stripe alipay 2020-10-20 17:15:55 +02:00
Benjamin Beganović
024d839038 stripe sofort 2020-10-20 17:12:53 +02:00
Benjamin Beganović
cd4ed74d5c set only-authorization to false in pay.blade 2020-10-20 16:09:46 +02:00
Benjamin Beganović
c82e5b2647 stripe adding credit card 2020-10-20 16:08:21 +02:00
Benjamin Beganović
9420f23081 stripe: pay with credit card token & credit 2020-10-20 15:19:21 +02:00
Benjamin Beganović
08501cceb6 stripe credit card 2020-10-20 14:58:48 +02:00
Benjamin Beganović
6af7aa7dc0 checkout: push aditional page 2020-10-19 23:49:17 +02:00
Benjamin Beganović
810f342907 checkout.com - authorize 2020-10-19 23:02:18 +02:00
Benjamin Beganović
4f9d9c106c checkout 2020-10-19 14:18:00 +02:00
Benjamin Beganović
97aad702c9 extract stripe payments into partials 2020-10-15 12:23:45 +02:00
David Bomba
bf592b0805
Merge pull request #4168 from beganovich/v2-cypress-payments-tests 
(v5) Stripe testing using Cypress
 2020-10-15 20:16:50 +11:00
Benjamin Beganović
b03387c571 Merge remote-tracking branch 'upstream/v2' into v2-cypress-payments-tests 2020-10-15 10:27:32 +02:00
David Bomba
52558d5b41 Credit view 2020-10-15 15:08:01 +11:00
David Bomba
901f7c4117 Working on credit payments 2020-10-15 14:35:35 +11:00
Benjamin Beganović
1d89656bad Setup changes: 
- Return actual SQL error when connection is failing
- Update buttons on setup with correct color
 2020-10-14 13:40:00 +02:00
Benjamin Beganović
89b950cbfd Testing Stripe: 
- Changed baseUrl to more generic localhost:8000
- Testing adding Stripe card & paying with it
- Added iframe helper functions
- Fix issue with processingOverlay when adding stripe credit card
- Added few selectors to pages for easier testing
 2020-10-13 13:36:56 +02:00
David Bomba
96750d5fdb Refactor for payments via client portal 2020-10-13 21:32:15 +11:00
David Bomba
57faf6eeb5 Use credits for payments in client portal 2020-10-13 14:25:51 +11:00
Benjamin Beganović
b0c383f75b Show empty string if country is not set: 
- Replace "No country set" with empty string in HtmlEngine.php
- Allow country_id & shipping_country_id to be null in shipping-address.blade.php & personal-address.blade.php
 2020-10-09 16:03:27 +02:00
David Bomba
cd0dce3816
Merge pull request #4138 from turbo124/v2 
Projects API
 2020-10-08 09:31:37 +11:00
Benjamin Beganović
2bae9bfc31 Update designs: 
- Remove <head>, <body>, <html> tags
- Unify padding/margin variables
 2020-10-07 18:35:30 +02:00
David Bomba
d4e2a0071a Analytics 2020-10-07 14:56:35 +11:00
David Bomba
1212ea756d
Merge pull request #4134 from turbo124/v2 
Work on Recurring Invoices
 2020-10-06 21:08:12 +11:00
Benjamin Beganović
b001da13d9 Show "amount" in the invoices-table 2020-10-05 13:45:09 +02:00
Benjamin Beganović
a339148f1b add 200px margin-bottom to the product-table 2020-10-05 10:24:55 +02:00
David Bomba
fccc98caa7 Fixes for model factories -> invoice designs 2020-10-04 20:34:08 +11:00
David Bomba
92c65f73da
Merge pull request #4125 from beganovich/v2-fix-font-size-variable 
Rename $font-size to $font_size & remove all comments from designs
 2020-10-01 21:45:00 +10:00
Benjamin Beganović
6796f7876d Remove comments from designsđ 2020-10-01 13:40:09 +02:00
Benjamin Beganović
b40d2bc50b Replace $font-size with $font_size 2020-10-01 13:37:34 +02:00
Benjamin Beganović
22e1497f9f playful 2020-10-01 13:33:48 +02:00
Benjamin Beganović
2ad363bf58 modern 2020-10-01 13:33:45 +02:00
Benjamin Beganović
eec2397eb5 hipster 2020-10-01 13:33:42 +02:00
Benjamin Beganović
ecfbf62856 elegant 2020-10-01 13:33:38 +02:00
Benjamin Beganović
40229e7ae3 business 2020-10-01 13:33:30 +02:00
Benjamin Beganović
1ea2c85e13 clean 2020-10-01 13:33:10 +02:00
Benjamin Beganović
a81ed59bc9 bold 2020-10-01 13:33:06 +02:00
Benjamin Beganović
4d959315c6 creative 2020-10-01 13:20:38 +02:00
Benjamin Beganović
2b39c1a5d7 Replace blue color with $primary_color: 
- Change ClientPortal helper to return 'bg-primary-darken' instead of 'active-page'
    - Buttons & input fields don't have SASS color now
    - bg-blue-600/900 replaced with primary/primary-darken
    - Production build of assets
 2020-09-30 13:31:15 +02:00
Benjamin Beganović
d947d2cfd4 Authorize.net: Payments 2020-09-29 13:17:41 +02:00
Benjamin Beganović
51bf831087 Authorize.net: Authorize CC 2020-09-29 13:13:50 +02:00
Benjamin Beganović
4814194568 Stripe: Sofort 2020-09-29 12:52:27 +02:00
Benjamin Beganović
12c23f14e5 Sofort: Alipay 2020-09-29 12:52:19 +02:00
Benjamin Beganović
58a3cc69a9 Stripe: Pay with credit card 2020-09-29 12:46:28 +02:00
Benjamin Beganović
72f915ef0a Stripe: Authorize ACH 2020-09-29 12:36:21 +02:00
Benjamin Beganović
36d322611e Stripe: Add credit card 2020-09-29 12:31:56 +02:00
David Bomba
1a4d2a4460
Merge pull request #4112 from beganovich/v2-rename-download-files-to-documents 
Rename "Downloads" to "Documents":
 2020-09-29 06:55:39 +10:00
Benjamin Beganović
69b24f95c4 Centralised variables: 
- New Helpers.php with sharedEmailVariables
- Merged settings from TemplateEngine
- @isset check for $whitelabel in the master.blade
 2020-09-28 12:36:51 +02:00
Benjamin Beganović
4e9bc0552d Rename "Downloads" to "Documents": 
- Remove Livewire auto-publish from composer.json
- Replace old DocumentController with DownloadsController
- Rename DownloadsTable & downloads-table to DocumentsTable & documents-table
- New ShowDocumentRequest for displaying documents
- Change authorize() with DownloadMultipleDocumentsRequest
- Change route in PortalComposer
- Update Livewire assets
- Remove old documents routes
 2020-09-28 12:04:34 +02:00
David Bomba
58e48034e7
Merge pull request #4110 from beganovich/v2-rename-downloads-to-documents 
(wip) Change Downloads translation to Documents in CP
 2020-09-28 20:00:46 +10:00
David Bomba
80ecab54af
Merge pull request #4106 from beganovich/v2-email-footer-whitelabel 
Add whitelabel to e-mail
 2020-09-28 20:00:28 +10:00
Benjamin Beganović
69b5ec1705 Change Downloads translation to Documents in CP 2020-09-28 11:45:22 +02:00
Benjamin Beganović
f51d7c99df Add whitelabel text to 'plain' design 2020-09-28 11:09:45 +02:00
Benjamin Beganović
c5fcb56ca6 Add whitelabel to e-mail 2020-09-25 13:57:02 +02:00
Benjamin Beganović
ee9bba2ae0 Fix bug with passing correct $amount 2020-09-25 11:25:52 +02:00
Benjamin Beganović
35ed396323 Profile settings: Shipping address 2020-09-24 14:40:27 +02:00
Benjamin Beganović
554e595211 Profile settings: Shipping address 2020-09-24 14:23:05 +02:00
Benjamin Beganović
e5183dee56 Profile section: Name, website, logo 2020-09-24 13:44:56 +02:00
Benjamin Beganović
a9e40aab37 Profile section: General informatioon 2020-09-24 13:29:41 +02:00
Benjamin Beganović
24685db429
Merge branch 'v2' into v2-editable-invoice-amount 2020-09-24 11:33:01 +02:00
Benjamin Beganović
0216286efc Support for over & under payments 2020-09-24 11:29:47 +02:00
David Bomba
8c1174b20b
Merge pull request #4095 from beganovich/v2-save-card-details-logic 
Save card opt-in/opt-out logic
 2020-09-22 07:30:44 +10:00
Benjamin Beganović
c6b24d1c75 Checkout: Optin/optout for saving card 2020-09-21 11:34:06 +02:00
Benjamin Beganović
d0894cec37 Authorize.net: Optin/optout for saving card 2020-09-21 11:24:19 +02:00
Benjamin Beganović
3a1906bd87 Stripe: Optin/optout for saving card 2020-09-21 11:17:16 +02:00
David Bomba
624f8db661 Improve payments page for client portal and fix invoice status after payment made 2020-09-19 20:33:59 +10:00
David Bomba
8dd8b83fd3 Fixes for passing settings object into all mail templates 2020-09-19 15:02:34 +10:00
David Bomba
23c22dd9dc Fixes for tests 2020-09-19 10:17:13 +10:00
Benjamin Beganović
a1e11cf161 invoices-table fix for balance due 2020-09-18 14:47:36 +02:00
Benjamin Beganović
2bb84fdbd9 Add support for in dark template 2020-09-18 14:38:16 +02:00
Benjamin Beganović
792f9717f7 Dynamic primary color borders on e-mails 2020-09-18 14:27:20 +02:00
David Bomba
12342e6002
Merge pull request #4084 from beganovich/v2-client-portal-fixes 
Client portal improvements & fixes
 2020-09-18 21:28:59 +10:00
Benjamin Beganović
8c342d5702 Hide fields without value 2020-09-18 11:02:21 +02:00
Benjamin Beganović
e36ff351de Pass method id when removing record 2020-09-18 09:48:14 +02:00
Benjamin Beganović
9aea0f081a Update designs with correct margins & paddings 2020-09-17 14:38:25 +02:00
Benjamin Beganović
aba699eb12 modern 2020-09-17 14:28:38 +02:00
Benjamin Beganović
449316582a invoiceninja logo into modern footer 2020-09-16 13:27:28 +02:00
Benjamin Beganović
2b70bd89a5 modern 2020-09-11 16:54:56 +02:00
Benjamin Beganović
9563f6e7a2 hipster 2020-09-11 16:50:49 +02:00
Benjamin Beganović
bae6a097d7 elegant 2020-09-11 16:49:59 +02:00
Benjamin Beganović
45e2590d90 creative 2020-09-11 16:48:39 +02:00
Benjamin Beganović
bc519a6f92 clean 2020-09-11 16:48:16 +02:00
Benjamin Beganović
0a33a408f2 business 2020-09-11 16:48:02 +02:00
Benjamin Beganović
d3f312b4ef bold 2020-09-11 16:47:47 +02:00
Benjamin Beganović
78bf39fcd1 plain 2020-09-11 16:46:09 +02:00
Benjamin Beganović
177eaa2ef5 playful 2020-09-11 16:45:55 +02:00
David Bomba
32aa291ff4
Merge pull request #4059 from beganovich/v2-design-polishing 
Updates for designs
 2020-09-11 21:07:53 +10:00
Benjamin Beganović
9a3dfb4f96 Update design padding & page-break 2020-09-11 11:53:52 +02:00
Benjamin Beganović
ed0fe053ec Hide Gateway Fees from invoices-table (cp) 2020-09-11 10:18:31 +02:00
David Bomba
c55f660f7f Generic handling page for unsuccessful payments 2020-09-11 08:30:12 +10:00
David Bomba
9beafcd73b
Merge pull request #4052 from turbo124/v2 
Fixes for Checkout.com
 2020-09-10 14:42:26 +10:00
David Bomba
100ca67c5f Add reference to checkout gateways 2020-09-10 11:23:04 +10:00
David Bomba
519293c6dd
Merge pull request #4051 from beganovich/v2-design-improvements 
Design improvements
 2020-09-10 07:43:32 +10:00
Benjamin Beganović
2176518345 Update designs margins, font-size variable 2020-09-09 17:08:31 +02:00
Benjamin Beganović
6288529907 - Accept every design as CUSTOM in PreviewController 
- Logic for excluding elements in table footer
- PdfMaker will now return plain HTML + str_replace filter
- HTMLEngine updated variables and aliases
- Added 'payment_due' translation
- Hipster: Updated variables
 2020-09-09 14:47:26 +02:00
=
1ee6e33bb7 Working on refactoring Checkout.com payment driver to extend BaseDriver 2020-09-09 10:58:35 +10:00
Benjamin Beganović
3104f4ed06 Merge remote-tracking branch 'upstream/v2' into v2-design-tfoot 2020-09-08 14:37:37 +02:00
Benjamin Beganović
2e66a4df83 Update designs @page margin 2020-09-08 12:40:04 +02:00
Benjamin Beganović
04c807c0b9 Update designs with new table footer 2020-09-08 13:14:44 +02:00
David Bomba
77119e69fe Add primary/secondary_color to companysettings 2020-09-08 14:02:00 +10:00
Benjamin Beganović
0bf39c739d
Merge branch 'v2' into v2-fix-setup-issues 2020-09-07 00:15:45 +02:00
David Bomba
ba75a44eb8
Laravel 7.x Shift (#40) 
* Adopt Laravel coding style

The Laravel framework adopts the PSR-2 coding style with some additions.
Laravel apps *should* adopt this coding style as well.

However, Shift allows you to customize the adopted coding style by
adding your own [PHP CS Fixer][1] `.php_cs` config to your project.

You may use [Shift's .php_cs][2] file as a base.

[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200

* Shift bindings

PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser.

* Shift core files

* Shift to Throwable

* Add laravel/ui dependency

* Unindent vendor mail templates

* Shift config files

* Default config files

In an effort to make upgrading the constantly changing config files
easier, Shift defaulted them so you can review the commit diff for
changes. Moving forward, you should use ENV variables or create a
separate config file to allow the core config files to remain
automatically upgradeable.

* Shift Laravel dependencies

* Shift cleanup

* Upgrade to Laravel 7

Co-authored-by: Laravel Shift <shift@laravelshift.com>
 2020-09-06 19:38:10 +10:00
Benjamin Beganović
7a5027f1b4 Enable sandboxing with PDFs & fix setup page issues 2020-09-06 04:23:04 +02:00
Benjamin Beganović
1a66f1835f Merge remote-tracking branch 'upstream/v2' into v2-pdfmaker-design-improvements 2020-09-04 13:20:39 +02:00
Benjamin Beganović
0962177252 Remove old designs 2020-09-04 13:18:17 +02:00
Benjamin Beganović
52dea9c665 Assign element ids in templates 2020-09-04 13:16:05 +02:00
Benjamin Beganović
4b6c2bff4c Added footer to designs 2020-09-04 10:18:58 +02:00
Benjamin Beganović
5b67a547d9 Update new designs 2020-09-04 08:42:58 +02:00
Benjamin Beganović
1bbf7392ad Refactor invoice-table for simple model bind & support for gateway-fees 2020-09-03 11:45:47 +02:00
Benjamin Beganović
1f77b87331 Refactor quotes-table for simple model bind 2020-09-03 11:14:24 +02:00
Benjamin Beganović
60ae138e11 Show gateway fees status for invoices 2020-09-02 22:08:12 +02:00
David Bomba
2bd8581592 Fixes for payments with gateway fees 2020-09-01 09:28:37 +10:00
David Bomba
bb4aac1aeb
Merge pull request #4025 from turbo124/v2 
Gateway fees implementation
 2020-08-31 17:58:43 +10:00
David Bomba
ac08a146a1 Working on gateway fees 2020-08-30 22:00:19 +10:00
David Bomba
c9be746583
Merge pull request #4018 from beganovich/v2-repeating-header-and-footer 
Repeating header & footer
 2020-08-28 07:07:28 +10:00
David Bomba
1a7d0d3cbd Working on gateway fees across multiple invoices 2020-08-27 22:12:39 +10:00
Benjamin Beganović
c8ff06e61d Update designs with new margins & paddings 2020-08-27 13:01:19 +02:00
Benjamin Beganović
09dc17d3dc Separate header section on templates 2020-08-26 12:51:54 +02:00
David Bomba
ff5d8ad871 Fixes for gateway fees 2020-08-26 11:14:15 +10:00
David Bomba
79e0fa56e2 Convert currency string to float 2020-08-26 10:47:50 +10:00
Benjamin Beganović
5a03d81112 Fix blank page when downloading invoices 2020-08-25 08:55:55 +02:00
Benjamin Beganović
7ed9e733b1 Switch from checkbox to radio buttons for saving card 2020-08-24 11:17:18 +02:00
Benjamin Beganović
2f50217900 Processing modal on payments 2020-08-24 10:28:55 +02:00
Benjamin Beganović
f12553bae8 wip 2020-08-24 09:07:44 +02:00
Benjamin Beganović
e518b3ca8d Stripe (CC): Add spinner for form processing 2020-08-24 08:25:12 +02:00
Benjamin Beganović
c985bdf1aa Hide "Pay now" button if no available payment methods 2020-08-24 07:18:57 +02:00
Benjamin Beganović
a0db7fdb1e Hide "Add payment method" if no bank/credit card gateway configured 2020-08-24 07:18:28 +02:00
David Bomba
662b5b2604
Merge pull request #4004 from turbo124/v2 
Update sentry DSN
 2020-08-20 23:20:12 +10:00
Benjamin Beganović
b77866c65b Setup break words 2020-08-20 03:14:24 +02:00
Benjamin Beganović
f4698c0108 Support multiple downloads 2020-08-20 03:10:04 +02:00
David Bomba
334860f87b Custom payment drivers 2020-08-20 08:11:46 +10:00
Benjamin Beganović
9b524f22e6 Download files with original name 2020-08-19 18:06:26 +02:00
Benjamin Beganović
c386167762 Add company setting for enabling client portal uploads 2020-08-19 16:35:54 +02:00
David Bomba
ba3f3e6989
Merge branch 'v2' into v2 2020-08-19 07:59:19 +10:00
David Bomba
c2f4b59756
Merge branch 'v2' into v2-1408-cp-downloads 2020-08-19 07:53:49 +10:00
Benjamin Beganović
159c2f05ae Add background to plain e-mail design 2020-08-18 16:34:49 +02:00
Benjamin Beganović
1f0f1e51ae
Merge branch 'v2' into v2-1408-cp-downloads 2020-08-18 16:02:49 +02:00
Benjamin Beganović
4eb376e830 Enabe client uploads 2020-08-18 16:01:25 +02:00
Benjamin Beganović
acdd9c936c Fix route model binding 2020-08-18 14:38:46 +02:00
David Bomba
5ccfb453e9 flutter refresh local storage 2020-08-18 09:02:17 +10:00
Benjamin Beganović
b8940d4cca Revert "Fix updating fields on CP profile page" 
This reverts commit 0df8cdf413.
 2020-08-17 18:38:20 +02:00
Benjamin Beganović
d16d6ca916 Update title 2020-08-17 18:37:21 +02:00
Benjamin Beganović
e68af3421a Fix Checkout payment driver 20087 cvv ctaching 2020-08-17 18:36:11 +02:00
Benjamin Beganović
0df8cdf413 Fix updating fields on CP profile page 2020-08-17 18:10:50 +02:00
Benjamin Beganović
0efaa767b9 Enable showing only client-related uploads 2020-08-17 16:31:49 +02:00
Benjamin Beganović
d55cfc42cf Separate page for download 2020-08-17 16:18:49 +02:00
Benjamin Beganović
4eb5490984 Enable downloads for the client 2020-08-14 17:29:26 +02:00
David Bomba
8028a71a9e
Merge pull request #3983 from beganovich/v2-1308-email-paddings 
Fix padding inside of e-mail content
 2020-08-14 06:53:54 +10:00
Benjamin Beganović
91dd0b5a6b Fix padding inside of content 2020-08-13 15:19:03 +02:00
Benjamin Beganović
207e271270 Update CSS link on the designs 2020-08-12 19:14:22 +02:00
Benjamin Beganović
1d7e4fd6c9 Implement footer signature & white-label logo 2020-08-11 17:57:35 +02:00
Benjamin Beganović
00903c717a Playful footer elements 2020-08-11 17:53:21 +02:00
Benjamin Beganović
2f40804568 Update designs so they reference Invoice or Quote 2020-08-10 13:18:05 +02:00
Benjamin Beganović
f7408e1fb3 Added new labels & update designs 2020-08-07 17:47:17 +02:00
David Bomba
f773356f70
Merge pull request #3951 from beganovich/v2-pdfmaker-integration 
Designs integration with new PDF Maker
 2020-08-06 07:57:56 +10:00
Benjamin Beganović
6676cab698 Playful 2020-08-05 15:40:57 +02:00
Benjamin Beganović
4f69a874cf Modern design 2020-08-05 15:17:45 +02:00