1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 08:51:34 +02:00
Commit Graph

722 Commits

Author SHA1 Message Date
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ć
d64308fdd1 production builds 2020-11-17 16:57:42 +01:00
Benjamin Beganović
a9cb656000 By clicking "Next step" you accept terms. & Not specified translations 2020-11-17 16:57:18 +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
David Bomba
c5643bea7b
Merge pull request #4287 from turbo124/v5-develop
Fixes for reminder templates
2020-11-10 19:32:44 +11:00
David Bomba
284bb9be9f
Merge pull request #4283 from beganovich/v5-fix-quote-approval-status
(v5) Fix quotes approval process in client portal
2020-11-10 07:29:14 +11:00
Benjamin Beganović
4dc3443d16 fix quotes not approving 2020-11-09 16:37:53 +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
David Bomba
be2f83cfea Endless reminder activity 2020-11-09 16:00:15 +11:00
David Bomba
fcef2c72b3 Working on payment emails 2020-11-09 13:39:42 +11:00
David Bomba
087c442a64 Add custom values to payments table 2020-11-09 08:21:52 +11: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
David Bomba
a98e9c3b68
Merge pull request #4252 from beganovich/v5-ach-refactor
(v5) ACH payments with Stripe
2020-11-03 23:14:02 +11:00
Benjamin Beganović
f50bbd1900 Fix issue with the form 2020-11-02 16:29:02 +01:00
Benjamin Beganović
0942169d4f Handle Alipay payments
- Refactored main Alipay class
- Added new N/A translation
- Fixed issue with alipay.js
2020-11-02 16:20:38 +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
7a67b8ded0
Merge pull request #4214 from beganovich/v5-fix-setup-javascript
(v5) Fix setup issue with opening new PDFs
2020-10-28 09:36:41 +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ć
8270762311 Fix setup issue with opening new PDFs 2020-10-27 14:02:36 +01:00
Benjamin Beganović
88b428aae0 checkout.com payments using token 2020-10-27 13:44:16 +01:00
David Bomba
97db2ad3b6
Merge pull request #4202 from beganovich/v2-checkout-refactor
(v5) Checkout.com refactor
2020-10-27 23:18:42 +11:00
Benjamin Beganović
488b8d859d Move saving methods into BaseDriver 2020-10-26 14:40:50 +01:00
David Bomba
1b2922b57c credit payment type 2020-10-26 11:58:08 +11: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ć
9e8ccf9eb7 remove unused js 2020-10-20 16:12:59 +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
David Bomba
3d40df6264 Fixes for ledger id in transformer 2020-10-16 08:55:24 +11: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
David Bomba
1e10f0297b
Merge pull request #4162 from beganovich/v2-fix-setup-buttons
(v5) Setup fixes & improvements
2020-10-15 08:15:31 +11:00
Benjamin Beganović
db196911cc Fix error while adding Stripe CC 2020-10-14 22:32:43 +02: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
Benjamin Beganović
cfcbc485b2 fix authorize 2020-10-09 12:43:26 +02:00
Benjamin Beganović
bdce885290 fix stripe 2020-10-09 12:03:12 +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
50b24c55d9 Working on applying credits to payments prior to billing via gateway 2020-10-07 22:03:53 +11: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
ab0ec5e2cb Vendor API endpoints 2020-09-23 10:16:19 +10: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