Benjamin Beganović
e6890e5430
Merge branch 'v5-develop' into v5-custom-payment-driver
2020-12-10 12:40:27 +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
7ba78cc342
Reduce notification emails to one per entity
2020-12-09 20:52:08 +11:00
David Bomba
6a03bcc546
Merge branch 'v5-develop' into v5-develop
2020-12-09 07:25:16 +11:00
David Bomba
ed3061fa7d
Remove html tags from texts
2020-12-09 07:22:35 +11:00
Benjamin Beganović
5d1349393a
update designs to suppport entity string
2020-12-08 16:45:24 +01:00
Benjamin Beganović
68a84df0dd
prefix all smtp fields with mail_
2020-12-08 14:29:15 +01:00
Benjamin Beganović
3ffb600117
prefix all db field with db_
2020-12-08 14:21:00 +01:00
David Bomba
594dda9b65
fixes for delivery notes{
2020-12-08 20:18:17 +11:00
David Bomba
8107a49677
remove trailing slash from app url
2020-12-08 07:21:08 +11:00
Benjamin Beganović
81a58d89f9
update label for checkout authorization
2020-12-07 10:15:43 +01: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ć
458e207fe3
fixes for smtp testing on setup
2020-12-03 14:10:40 +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ć
1a066f2f9f
add alias to task searvice from task product
2020-12-01 15:18:48 +01: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ć
242d48cd1a
update variables for .env instead of writing completely new file
2020-11-24 11:45:27 +01: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
David Maksimov
12427cd64f
Remove spaces from credit card number
2020-11-20 16:22:57 -06: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ć
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
