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

539 Commits

Author SHA1 Message Date
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