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

299 Commits

Author SHA1 Message Date
Benjamin Beganović
bb3bfabe66 Update translations on billing page 2021-07-08 12:28:22 +02:00
Benjamin Beganović
e27739239f Make plan information side wider 2021-07-08 12:20:10 +02:00
Benjamin Beganović
a34b1734be Gateways: Stripe: Pay with new credit card 2021-07-07 13:05:02 +02:00
Benjamin Beganović
6e5a085787 Profile settings: Page loads 2021-07-06 14:13:18 +02:00
Benjamin Beganović
684b21e124 Extract attachments component 2021-06-30 20:40:51 +02:00
David Bomba
d7e551fc95 Fixes for subscriptions 2021-06-27 21:55:15 +10:00
David Bomba
021761d33d Make navigating subscriptions easier 2021-06-27 19:20:56 +10:00
Benjamin Beganović
eb34cd81b1 Ability to toggle auto_bill_enabled on client side 2021-06-25 10:09:57 +02:00
Benjamin Beganović
cca78a9d38 Ability to select primary payment method 2021-06-25 09:15:57 +02:00
Benjamin Beganović
a6fecf0a38 Billing page: Resize container 2021-06-24 16:11:27 +02:00
Benjamin Beganović
bffcca9b04 Show project name in the tasks table 2021-06-17 16:24:33 +02:00
Benjamin Beganović
a5fec384a8 Swap balance & amount in invoices-table.blade.php 2021-05-25 18:19:07 +02:00
Benjamin Beganović
78a820c54c wip 2021-05-25 01:06:33 +02:00
Benjamin Beganović
72463045cb wip 2021-05-24 18:07:23 +02:00
Benjamin Beganović
6f7afabbc3 wip 2021-05-19 14:19:34 +02:00
Benjamin Beganović
42f2065f8a Update mobile sidebar to white 2021-05-19 13:28:06 +02:00
Benjamin Beganović
2bf46fccb5 Show empty text when no public_notes is present 2021-05-18 11:53:24 +02:00
Benjamin Beganović
5a84fb6990 Tasks module in the client portal 2021-05-12 16:39:29 +02:00
David Bomba
a4fd595d38 Allow HTML to be displayed for products in Subscriptions npage 2021-05-12 17:01:14 +10:00
Benjamin Beganović
1f6596e835 Make "Pay now" button follow primary-color 2021-05-11 15:27:13 +02:00
Benjamin Beganović
4803cef69b Show the payment number in the client portal 2021-05-11 15:02:52 +02:00
David Bomba
6bfaa11f59
Merge branch 'v5-develop' into v5-2804-braintree 2021-05-11 21:14:54 +10:00
David Bomba
ad2742a0d6 Disable client portal 2021-05-11 11:55:47 +10:00
Benjamin Beganović
a3099b5cde Fixes for tests 2021-05-03 17:25:03 +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
David Bomba
aabe5683e1 Refactoring subscriptions 2021-04-14 14:41:04 +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ć
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ć
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
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ć
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
Benjamin Beganović
83844652e5 show og price when discount is applied 2021-04-01 17:02:11 +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
Benjamin Beganović
124490ab48 wip 2021-04-01 01:55:46 +02:00
Benjamin Beganović
c300ffc4d9 passwordless login 2021-03-31 18:10:44 +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ć
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ć
127c6cb3cd wip 2021-03-17 16:12:25 +01: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ć
908678cdc4 wip 2021-03-12 15:00:33 +01:00
Benjamin Beganović
d546c4711c wip 2021-03-11 17:20:30 +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
Benjamin Beganović
9b227010b2 Quotes: Remove "drafts" 2021-03-02 18:29:44 +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ć
dfee4d718b Change "Overdue" to "Past due" in invoices table 2021-03-02 13:43:41 +01:00
Benjamin Beganović
7990ca22ec Centralize "Pay now" button 2021-02-18 13:37:27 +01:00
Benjamin Beganović
e7e65e128a wip 2021-02-16 13:24:09 +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ć
4969b32ccd Add target=_blank to social links 2021-02-11 14:21:58 +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ć
862bbec4f5 -1 to ♾ 2021-02-02 14:59:10 +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ć
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
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ć
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
David Bomba
435365b32b Add youtube channel to client portal 2021-01-14 13:43:08 +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
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ć
6526e5e378 Show default view as full-screen for invoices 2021-01-13 14:46:41 +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
249c0e8b2b fix for presenting company logo in portal 2021-01-13 12:15:04 +11:00
Benjamin Beganović
ff3ee60cf9 wip 2021-01-12 15:43:07 +01:00
Benjamin Beganović
cb928833c5 Show endless for recurring invoices with -1 cycles 2021-01-04 14:24:30 +01:00
Benjamin Beganović
1f2c3f2823 update pagination links & apply php-cs-fixer 2020-12-05 14:24:21 +01:00
Benjamin Beganović
d84f5bc5bb Fixes for Checkout.com refunding 2020-12-03 13:38:57 +01:00
Benjamin Beganović
35fe90fc9f update whitelabeling partials 2020-12-01 14:44:35 +01:00
Benjamin Beganović
de15e9d1ce render terms & policy under conidition 2020-11-18 14:55:46 +01:00
Benjamin Beganović
8a6873354f fix flashing cancellation modal & user dropdwon 2020-11-17 15:52:40 +01:00
Benjamin Beganović
134fe6bfee support for privacy policy & temrs in cp 2020-11-16 13:06:26 +01:00
Benjamin Beganović
7f3c4ada5a Merge remote-tracking branch 'upstream/v5-develop' into v2-frontend-refactor 2020-11-01 19:26:43 +01:00
David Bomba
b267353ced Fixes for credits view in portal 2020-10-29 21:19:10 +11: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ć
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
Benjamin Beganović
b001da13d9 Show "amount" in the invoices-table 2020-10-05 13:45:09 +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ć
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
Benjamin Beganović
a1e11cf161 invoices-table fix for balance due 2020-09-18 14:47:36 +02:00
Benjamin Beganović
ed0fe053ec Hide Gateway Fees from invoices-table (cp) 2020-09-11 10:18:31 +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
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ć
a0db7fdb1e Hide "Add payment method" if no bank/credit card gateway configured 2020-08-24 07:18:28 +02:00
Benjamin Beganović
f4698c0108 Support multiple downloads 2020-08-20 03:10:04 +02: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
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
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
Benjamin Beganović
f7c7a20179 Make Invoice Ninja logo redirect to invoiceninja.com 2020-07-29 16:40:21 +02:00
Benjamin Beganović
183a51b27c Update quotes page with right terminology 2020-07-23 12:20:19 +02:00
Benjamin Beganović
eb655762d4 Adding payment methods from menu 2020-07-03 14:39:29 +02:00
Benjamin Beganović
4918269bf2 Testing adding Stripe credit card
- Added: iframeLoaded method for Cypress
- Fixed: saving payment method id for CreditCard.php
- Added: chromeWebSecurity: false flag for insecure iframe connections
- Formatted: payment_methods/index
- Formatted: payment-methods-table.blade.php
- Added: Test for adding credit card to Stripe
- Fixed: Removing client gateway tokens
2020-07-01 18:28:57 +02:00
David Bomba
ae8a61cbcd Fixes for tests 2020-06-27 14:09:16 +10:00
Benjamin Beganović
e5fedfa206 Fix wrong route 2020-06-26 15:16:40 +02:00
Benjamin Beganović
ca103e16db Remove white card on top of pages 2020-06-15 17:34:26 +02:00
Benjamin Beganović
63d712226c Social links in the sidebar 2020-06-15 17:12:08 +02:00
Benjamin Beganović
701b9531bf Remove search bar from header 2020-06-15 15:53:52 +02:00
Benjamin Beganović
1e692d86c7 Show logo in footer 2020-06-15 15:52:17 +02:00
Benjamin Beganović
fae2326aa7 Implement footer with copyright message 2020-06-15 15:46:01 +02:00
Benjamin Beganović
703ef51685
Client portal tests (using Cypress.io) (#3758)
* Install Cypress

* Fix npm vulnerabilities

* scaffold cypress

* ignore local tests

* login page test

* invoices tests

* recurring invoices

* payments tests

* payment methods tests

* update invoices & quotes

* credits tests
2020-05-27 07:45:29 +10:00
Benjamin Beganović
6e473b9987
Fix quotes page (undefined variable) (#3719)
* fix quotes page

* fix translation
2020-05-19 22:59:59 +10:00
Benjamin Beganović
81aa4cc52e
Client portal tests (#3704) 2020-05-15 07:04:41 +10:00
Benjamin Beganović
1f846e3136
fix counter (#3684) 2020-05-12 09:24:47 +10:00
Benjamin Beganović
2704bf2f82
Client portal improvements & bug fixes (#3678)
* fix turbolink 404

* fix checkbox when adding card using stripe

* Fix hashed_ids problem when using PayPal

* php-cs-fixer

* Bump tailwind & purgecss

* fix auth scope

* scope to auth contact company
2020-05-09 08:20:37 +10:00
Benjamin Beganović
7f9abbf96b
Quick login with client contacts (#3680)
- New dropdown in navigation bar
- New switch_company route
- New $multiple_contacts variable in PortalComposer
2020-05-09 08:19:39 +10:00
Benjamin Beganović
e3e52987c3
Reset v2 into working stage (#3673)
* fix withsorting

* fix recurring invoices table

* Reset BasePaymentDriver
2020-05-05 07:22:31 +10:00
Benjamin Beganović
3aa884dc11
Client portal improvements (#3654)
* Invoice table filters

* Quotes table filters

* Improve tables & translation

* Fix profile page inputs

* Fix profile page inputs & bump TailwindCSS version
2020-04-25 09:17:37 +10:00
Benjamin Beganović
ab8b05dd56
Client portal improvements (#3652)
* Install livewire/livewire

* Table improvements

- Cleanup of InvoiceController
- Added Livewire package
- New Livewire component (InvoicesTable)
- New WithSorting trait
- Removed rendering invoices from index.blade.php
- Removed Yaryabox/Datatables references in InvoiceController

* Refactor: Recurring invoices

* payments table & sorting improvements

* payment methods table

* quotes table

* credits table

* Add turbolinks
2020-04-23 08:49:23 +10:00
Benjamin Beganović
f118f3bfda
Show custom messages (#3616)
* Show custom messages

* Fix getSetting key

* Add custom messages support with variable parsing
2020-04-13 11:48:23 +10:00
Benjamin Beganović
28cc7d5e52
Client portal improvements: (#3595)
-  Hide Create Payment Method if no gateways exist
- Payment Screen, add $amount
- Fix breadcrumbs
2020-04-07 07:23:05 +10:00
Benjamin Beganović
ac5525c9ac
[V2] Client portal rework (#3516)
* Client login, reset and update password page

* Client dashboard, sidebar, PortalComposer.php

* wip

* Personal page & update for details

* Invoices, paying & pagination.blade.php

* Invoices, recurring invoice & buttons

* Payments, link component

* Payment methods

* Breadcrums, clean up & wrap up

* Remove format_date() method to formatDate on object

* Payments
- $this->render is now proxy for render()
- Removed logic from Controller.php to ClientPortal.php
- Added MakesDates to ClientGatewayToken.php
- StripePaymentDriver.php now returns correct views
- Refactor of adding new payment method
- Ignoring all local builds for public/js/clients/*

* Signature, wip

* Fix "Pay now" on single invoice

* Payments:
- Added ProcessInvoicesInBulk request class
- Refactor InvoiceController::bulk()
- Displaying terms & payments
- New signature.blade.php
- Removed comment from webpack.mix.js

* Quotes:
- Refactor ProcessInvoicesInBulk.php to ProcessInvoicesInBulkRequest.php
- Add new 'Quotes' field inside of PortalComposer.php
- Added MakesDates to Quote.php
- Added Quote::badgeForStatus()
- Cleanup payment.blade.php
- Quote showing and approving
- New resource 'quotes' in client.php
- New image for quotes, align-left.svg

* Credits:
- New 'credits' resource in client.php
- Fixes for client.php typo

* Breadcrumbs:
- Quotes
- Credits

* Placeholder for translations.

* Restore whereIn & client scope

Co-authored-by: David Bomba <turbo124@gmail.com>
2020-03-24 04:10:42 +11:00