Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-15 23:52:33 +01:00
Code Issues Releases Activity
8,086 Commits 7 Branches 925 Tags 2 GiB
b2aca30453
Commit Graph

158 Commits

Author SHA1 Message Date
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
c2990a21d0 Fixes for tests 2021-04-14 16:48:32 +10: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
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
bde5166827 Subscriptions 2021-04-12 21:56:08 +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ć
94a7515244
Merge pull request #5408 from beganovich/v5-1004-desc-sort-invoices 
(v5) Client portal: Sort invoices in descending order
 2021-04-12 11:52:39 +01: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ć
bb7f9c64d5 Sort invoices in descending order 2021-04-10 12:48:51 +02:00
Benjamin Beganović
b345e12678 Add withTrashed for invoices table 2021-04-10 10:56:48 +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ć
43e6ba2ec6 Check if payment is eligible to process 2021-04-07 13:26:50 +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ć
b25f79f4e1 carry coupon over magic link 2021-04-01 16:20:31 +02:00
Benjamin Beganović
0b2613146b Show spinner after clicking payment method 2021-04-01 16:09:30 +02:00
Benjamin Beganović
30d3c8a92e pull the initial price from the model itself 2021-04-01 16:04:22 +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ć
97d92cd127 wip 2021-03-29 12:25:29 +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
David Bomba
abd3a89bc9
Subscriptions (#5248) 
* Fixes for converting quote to invoice

* Fixes for naming PDFs

* Refresh entity prior to sending

* Fixes for subscriptions

* Add in required use

* Fixes for notifications

* Fixes for notifications

* Add with trasheD

* Rename BillingSubscriptions to Subscriptions

* Refactoring subscriptions
 2021-03-25 21:55:59 +11:00
Benjamin Beganović
49c4707e38
Update BillingPortalPurchase.php 2021-03-23 16:27:30 +01:00
Benjamin Beganović
77fdb25304
Merge branch 'v5-develop' into v5-2203-billing-portal 2021-03-23 16:23:56 +01:00
=
3d375e4148 Workig on client subscriptions 2021-03-23 23:17:28 +11:00
David Bomba
417ed6c13d Fixes for recurring 2021-03-23 08:24:05 +11:00
David Bomba
3ebe533fc8 include Account clas 2021-03-23 07:09:42 +11:00
Benjamin Beganović
e78fb7e891 Update quering the language/locale using Cache instead of DB 2021-03-22 14:09:29 +01:00
Benjamin Beganović
535d9ae471 Update data passed to startTrial 2021-03-22 14:03:32 +01:00
Benjamin Beganović
d5ad6088f6 Create data mapper for cached data / billing context 2021-03-22 13:56:26 +01:00
Benjamin Beganović
6e714747bd Update price per quantity 2021-03-22 13:53:34 +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ć
44bf716fc9
Merge branch 'v5-develop' into v5-2003-fix-billing-subscription-integration 2021-03-22 11:12:14 +01:00
Benjamin Beganović
fdd1601120 wip 2021-03-20 23:15:26 +01:00
Benjamin Beganović
d98165a8dd Set client language_id if locale is present 2021-03-18 16:01:13 +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
David Bomba
9ca9736de6 resolved conflicts' 2021-03-18 12:00:01 +11:00
David Bomba
ee15ea9434 v5.1.27 2021-03-18 11:58:10 +11:00
David Bomba
086189a1ea Hosted PDFs by invoice ninja 2021-03-18 11:53:08 +11: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ć
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ć
b9bea02b68 wip 2021-03-13 14:51:01 +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
Benjamin Beganović
7990ca22ec Centralize "Pay now" button 2021-02-18 13:37:27 +01:00
Benjamin Beganović
aacc3b6602 wip 2021-02-15 15:52:13 +01:00
Benjamin Beganović
6afed935db Hide draft credits from client 2021-02-11 14:14:11 +01:00
Benjamin Beganović
3c4e779585 add mount to requiredfields 2021-01-25 10:07:12 +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ć
3970ee3450 only require email in settings 2021-01-15 14:07:33 +01:00
Benjamin Beganović
72b509dfe2 only require postal_code for billing address 2021-01-15 13:27:46 +01:00
David Bomba
b72a4567db
Merge pull request #4688 from beganovich/v5-0114-remove-url-in-settings 
(v5) Client portal: Remove URL validation from the website
 2021-01-15 08:33:09 +11:00
Benjamin Beganović
f8e57f57a5 Remove drafts from the quotes-table 2021-01-14 14:17:39 +01:00
Benjamin Beganović
6f9bedd7f1 remove url validation from settings/website 2021-01-14 14:15:09 +01:00
Benjamin Beganović
9516f877f6 Skip showing the page if no fields 2021-01-13 13:39:34 +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
Benjamin Beganović
0b4e85957c wip 2021-01-12 16:30:11 +01: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
David Bomba
934610a01c Update copyright + version bump + set canadian dollar symbol to $ 2021-01-04 08:54:54 +11:00
Benjamin Beganović
1f2c3f2823 update pagination links & apply php-cs-fixer 2020-12-05 14:24:21 +01:00
Benjamin Beganović
2618a1d3b8 add ability to edit client's phone 2020-11-27 12:08:39 +01:00
Benjamin Beganović
ae88d5e08e php-cs-fixer format 2020-11-25 15:19:52 +01:00
David Bomba
9aeb2d7a5b Psalm cleanup 2020-10-28 21:10:49 +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
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ć
35ed396323 Profile settings: Shipping address 2020-09-24 14:40:27 +02:00
Benjamin Beganović
b06c9c18fc Update country_id for personal country id 2020-09-24 14:40:20 +02:00
Benjamin Beganović
2f089707f4 Use Hash:: to encrypt passwords 2020-09-24 14:40:06 +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
David Bomba
ab0ec5e2cb Vendor API endpoints 2020-09-23 10:16:19 +10:00
Benjamin Beganović
ed0fe053ec Hide Gateway Fees from invoices-table (cp) 2020-09-11 10:18:31 +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ć
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ć
9b524f22e6 Download files with original name 2020-08-19 18:06:26 +02:00
Benjamin Beganović
0a493c275e Enable is_public for document uploads 2020-08-18 16:12:46 +02:00
Benjamin Beganović
d58ab5d613 Production build of assets 2020-08-17 16:38:33 +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ć
f744820565 Hide draft from clients 2020-07-23 12:17:09 +02:00